extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-15 18:38:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

If application is provided, app is expecting just the ID back

Browse Source
This commit is contained in:
Nathan Gray 2012-03-22 23:20:56 +00:00
parent e4a4154f3f
commit 4551e495be
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
etemplate/js/et2_widget_link.js
View File

@ -296,7 +296,7 @@ var et2_link_apps = et2_selectbox.extend({
}); });
et2_register_widget(et2_link_apps, ["link-apps"]); et2_register_widget(et2_link_apps, ["link-apps"]);
var et2_link_entry = et2_valueWidget.extend({ var et2_link_entry = et2_inputWidget.extend({
attributes: { attributes: {
"application": { "application": {
@ -544,7 +544,14 @@ var et2_link_entry = et2_valueWidget.extend({
{ {
if(!this.options.select(event, selected)) return false; if(!this.options.select(event, selected)) return false;
} }
if(event.data.options.application && typeof event.data.options.value !== "object") {
// Application given in options, just use ID as the value
event.data.options.value = selected.item.value;
}
else
{
event.data.options.value.id = selected.item.value; event.data.options.value.id = selected.item.value;
}
event.data.search.val(selected.item.label); event.data.search.val(selected.item.label);
}, },
@ -651,7 +658,7 @@ var et2_link = et2_valueWidget.extend([et2_IDetachedDOM], {
return; return;
} }
// Application set, just passed ID // Application set, just passed ID
else if (_value == parseInt(_value)) else if (typeof _value != "object")
{ {
_value = { _value = {
app: this.options.application, app: this.options.application,