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

SelectAccount with type "none" should get sel_options but it should be readonly if user has no admin access. Fix infolog delegation for admin users with selectAccount type "none" selected

Browse Source
This commit is contained in:
Hadi Nategh 2014-08-22 11:48:18 +00:00
parent 3fb93c33a6
commit 80cd11972a
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -199,8 +199,10 @@ class etemplate_widget_menupopup extends etemplate_widget
{ {
// Check selection preference, we may be able to skip reading some data // Check selection preference, we may be able to skip reading some data
$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']['apps']['admin'] && $select_pref == 'none') if($this->attrs['type'] == 'select-account' && !$GLOBALS['egw_info']['user']['apps']['admin'] && $select_pref == 'none')
{ {
self::$request->preserv[$this->id] = self::$request->content[$this->id];
unset(self::$request->content[$this->id]);
$this->attrs['readonly'] = true; $this->attrs['readonly'] = true;
} }

1
etemplate/js/et2_widget_selectAccount.js
View File

@ -111,7 +111,6 @@ var et2_selectAccount = et2_selectbox.extend(
switch(type) switch(type)
{ {
case 'none': case 'none':
break;
case 'selectbox': case 'selectbox':
case 'groupmembers': case 'groupmembers':
default: default:

2
infolog/inc/class.infolog_ui.inc.php
View File

@ -2060,8 +2060,6 @@ class infolog_ui
{ {
$readonlys['tabs']['project'] = true; // disable the project tab $readonlys['tabs']['project'] = true; // disable the project tab
} }
$readonlys['tabs']['delegation'] = $GLOBALS['egw_info']['user']['preferences']['common']['account_selection'] == 'none' &&
!isset($GLOBALS['egw_info']['user']['apps']['admin']);
$content['duration_format'] = $this->duration_format; $content['duration_format'] = $this->duration_format;
$content['hours_per_workday'] = $this->hours_per_workday; $content['hours_per_workday'] = $this->hours_per_workday;