holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes for broken select-account:

Browse Source 
- Fix select account dialog Ok button not working
- Fix selecting a searched account in dialog not working
- Fix broken search dialog
This commit is contained in:
Hadi Nategh 2017-12-05 15:21:25 +01:00
parent c1faf8329d
commit 18b21c0aef
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
api/js/etemplate/et2_widget_selectAccount.js
View File

@ -71,9 +71,12 @@ var et2_selectAccount = (function(){ "use strict"; return et2_selectbox.extend(
// Holder for search jQuery nodes // Holder for search jQuery nodes
this.search = null; this.search = null;
// Reference to object with dialog // Reference to dialog
this.dialog = null; this.dialog = null;
// Reference to widget within dialog
this.widgets = null;
this._super.call(this, _parent, _attrs); this._super.call(this, _parent, _attrs);
// Allow certain widgets inside this one // Allow certain widgets inside this one
@ -365,12 +368,10 @@ var et2_selectAccount = (function(){ "use strict"; return et2_selectbox.extend(
// Selecting a single user closes the dialog, this only used if user cleared // Selecting a single user closes the dialog, this only used if user cleared
var ok_click = function() { var ok_click = function() {
jQuery(this).dialog("close");
widget.set_value([]); widget.set_value([]);
// Fire change event // Fire change event
if(widget.input) widget.input.trigger("change"); if(widget.input) widget.input.trigger("change");
// Free it up, it will be re-created, if ever needed again jQuery(this).dialog("close");
jQuery(this).dialog("destroy");
}; };
widget._create_dialog(search, ok_click); widget._create_dialog(search, ok_click);
}, },
@ -416,9 +417,6 @@ var et2_selectAccount = (function(){ "use strict"; return et2_selectbox.extend(
widget.set_value(ids); widget.set_value(ids);
// Free it up, it will be re-created, if ever needed again
jQuery(this).dialog("destroy");
// Fire change event // Fire change event
if(widget.input) widget.input.trigger("change"); if(widget.input) widget.input.trigger("change");
}; };
@ -434,8 +432,8 @@ var et2_selectAccount = (function(){ "use strict"; return et2_selectbox.extend(
* @param {function} update_function * @param {function} update_function
*/ */
_create_dialog: function(widgets, update_function) { _create_dialog: function(widgets, update_function) {
this.dialog = widgets; this.widgets = widgets;
var dialog = et2_dialog.show_dialog(false, this.dialog = et2_dialog.show_dialog(false,
'', '',
this.options.label ? this.options.label : this.egw().lang('Select'), this.options.label ? this.options.label : this.egw().lang('Select'),
{}, {},
@ -448,11 +446,11 @@ var et2_selectAccount = (function(){ "use strict"; return et2_selectbox.extend(
image: 'cancel' image: 'cancel'
}] }]
); );
dialog.set_dialog_type(''); this.dialog.set_dialog_type('');
// Static size for easier layout // Static size for easier layout
dialog.div.dialog({width: "500", height: "370"}); this.dialog.div.dialog({width: "500", height: "370"});
dialog.div.append(widgets.width('100%')); this.dialog.div.append(widgets.width('100%'));
return widgets; return widgets;
}, },
@ -495,8 +493,7 @@ var et2_selectAccount = (function(){ "use strict"; return et2_selectbox.extend(
self.set_value(selected.item.value); self.set_value(selected.item.value);
if(self.dialog) if(self.dialog)
{ {
self.dialog.dialog("close"); self.dialog.div.dialog("close");
self.dialog.dialog("destroy");
} }
// Fire change event // Fire change event
if(self.input) self.input.trigger("change"); if(self.input) self.input.trigger("change");
@ -548,7 +545,7 @@ var et2_selectAccount = (function(){ "use strict"; return et2_selectbox.extend(
if(item.value) item.value = parseInt(item.value); if(item.value) item.value = parseInt(item.value);
// (containter of) Currently selected users / groups // (containter of) Currently selected users / groups
var selected = jQuery('#'+this.getInstanceManager().uniqueId + "_selected", this.dialog); var selected = jQuery('#'+this.getInstanceManager().uniqueId + "_selected", this.widgets);
// Group // Group
if(item.value && item.value < 0) if(item.value && item.value < 0)