extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-03 12:39:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Some changes for easier extension

Browse Source
This commit is contained in:
nathangray 2018-06-11 10:24:31 -06:00
parent 9ba79fb0cd
commit 460206a208
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
admin/js/app.js
View File

@ -473,16 +473,19 @@ app.classes.admin = AppJS.extend(
* *
* @param content List of content for the dialog template * @param content List of content for the dialog template
* @param sel_options optional select options * @param sel_options optional select options
* @param {et2_widget} widgetContainer of etemplate that 'owns' the dialog
* @param {string} app Name of app
*/ */
_acl_dialog: function(content, sel_options) _acl_dialog: function(content, sel_options, etemplate, app, callback)
{ {
if(typeof content == 'undefined') content = {}; if(typeof content == 'undefined') content = {};
// Determine which application we're running as // Determine which application we're running as
var app = egw.app_name(); // can be either admin or preferences! app = app ? app : egw.app_name();
// can be either admin or preferences!
if (app != 'admin') app = 'preferences'; if (app != 'admin') app = 'preferences';
// Get by ID, since this.et2 isn't always the ACL list // Get by ID, since this.et2 isn't always the ACL list
var et2 = etemplate2.getById('admin-acl').widgetContainer; var et2 = etemplate ? etemplate : etemplate2.getById('admin-acl').widgetContainer;
var className = app+'_acl'; var className = app+'_acl';
var acl_rights = {}; var acl_rights = {};
var readonlys = {acl: {}}; var readonlys = {acl: {}};
@ -626,11 +629,11 @@ app.classes.admin = AppJS.extend(
// Remove any removed // Remove any removed
if(removed.length > 0) if(removed.length > 0)
{ {
this.egw.json(className+'::ajax_change_acl', [removed, 0], this._acl_callback,this,false,this) this.egw.json(className+'::ajax_change_acl', [removed, 0], callback ? callback : this._acl_callback,this,false,this)
.sendRequest(); .sendRequest();
} }
} }
this.egw.json(className+'::ajax_change_acl', [id, rights], this._acl_callback,this,false,this) this.egw.json(className+'::ajax_change_acl', [id, rights], callback ? callback : this._acl_callback,this,false,this)
.sendRequest(); .sendRequest();
} }
},this), },this),