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

Documentation update to be a little more clear about 'none' option

Browse Source
This commit is contained in:
Nathan Gray 2015-02-26 16:16:00 +00:00
parent bbd06f1cbe
commit 60e13cd679
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
etemplate/inc/class.etemplate_widget_menupopup.inc.php
View File

@ -220,6 +220,7 @@ class etemplate_widget_menupopup extends etemplate_widget
$select_pref = $GLOBALS['egw_info']['user']['preferences']['common']['account_selection']; $select_pref = $GLOBALS['egw_info']['user']['preferences']['common']['account_selection'];
if($this->attrs['type'] == 'select-account' && !$GLOBALS['egw_info']['user']['apps']['admin'] && $select_pref == 'none') if($this->attrs['type'] == 'select-account' && !$GLOBALS['egw_info']['user']['apps']['admin'] && $select_pref == 'none')
{ {
// Preserve but do not send the value if preference is 'none'
self::$request->preserv[$this->id] = self::$request->content[$this->id]; self::$request->preserv[$this->id] = self::$request->content[$this->id];
unset(self::$request->content[$this->id]); unset(self::$request->content[$this->id]);
$this->attrs['readonly'] = true; $this->attrs['readonly'] = true;

2
etemplate/js/et2_widget_selectAccount.js
View File

@ -22,7 +22,7 @@
/** /**
* Account selection widget * Account selection widget
* Changes according to the user's account_selection preference * Changes according to the user's account_selection preference
* - 'none' => Server-side: the read-only widget is used * - 'none' => Server-side: the read-only widget is used, and no values are sent or displayed
* - 'groupmembers' => Non admins can only select groupmembers (Server side - normal selectbox) * - 'groupmembers' => Non admins can only select groupmembers (Server side - normal selectbox)
* - 'selectbox' => Selectbox with all accounts and groups (Server side - normal selectbox) * - 'selectbox' => Selectbox with all accounts and groups (Server side - normal selectbox)
* - 'primary_group' => Selectbox with primary group and search * - 'primary_group' => Selectbox with primary group and search