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

- Clear owner & allowed popups after changing

Browse Source 
- Make allowed popup user selection not look disabled
This commit is contained in:
Nathan Gray 2012-12-03 22:43:47 +00:00
parent 57cc6dba1a
commit bff2bdc6d6
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
importexport/inc/class.importexport_definitions_ui.inc.php
View File

@ -127,6 +127,7 @@ class importexport_definitions_ui
// Action has an additional parameter // Action has an additional parameter
if(in_array($content['nm']['action'], array('owner', 'allowed'))) if(in_array($content['nm']['action'], array('owner', 'allowed')))
{ {
$action = $content['nm']['action'];
if($content['nm']['action'] == 'allowed') if($content['nm']['action'] == 'allowed')
{ {
$content['allowed'] = $content['allowed_private'] ? null : ($content['all_users'] ? 'all' : implode(',',$content['allowed'])); $content['allowed'] = $content['allowed_private'] ? null : ($content['all_users'] ? 'all' : implode(',',$content['allowed']));
@ -136,6 +137,7 @@ class importexport_definitions_ui
$content[$content['nm']['action']] = implode(',',$content[$content['nm']['action']]); $content[$content['nm']['action']] = implode(',',$content[$content['nm']['action']]);
} }
$content['nm']['action'] .= '_' . $content[$content['nm']['action']]; $content['nm']['action'] .= '_' . $content[$content['nm']['action']];
unset($content[$action]);
} }
if ($this->action($content['nm']['action'],$content['nm']['selected'],$content['nm']['select_all'], if ($this->action($content['nm']['action'],$content['nm']['selected'],$content['nm']['select_all'],
$success,$failed,$action_msg,'index',$msg)) $success,$failed,$action_msg,'index',$msg))

6
importexport/setup/etemplates.inc.php
View File

File diff suppressed because one or more lines are too long

2
importexport/templates/default/definition_index.xet
View File

@ -88,7 +88,7 @@
<description value="Select groups"/> <description value="Select groups"/>
<checkbox label="%s Just me" id="allowed_private"/> <checkbox label="%s Just me" id="allowed_private"/>
<checkbox label="%s All users" id="all_users"/> <checkbox label="%s All users" id="all_users"/>
<listbox type="select-account" id="allowed" rows="5" options="groups" class="action_popup-content"/> <listbox type="select-account" id="allowed" rows="5" options="groups"/>
<hbox> <hbox>
<button label="Save" onclick="nm_submit_popup(this); return false;"/> <button label="Save" onclick="nm_submit_popup(this); return false;"/>
<buttononly label="Cancel" onclick="nm_hide_popup(this,'allowed_popup');"/> <buttononly label="Cancel" onclick="nm_hide_popup(this,'allowed_popup');"/>