forked from extern/egroupware
Two new options for the account-selection:
- Selectbox with groupmembers (only) - No user-selection at all These two options limit the visibility of other users. There for they should be forced and apply NOT to administrators.
This commit is contained in:
parent
153a642b56
commit
d550e7234d
@ -36,9 +36,41 @@ class uical
|
|||||||
*/
|
*/
|
||||||
var $debug=false;
|
var $debug=false;
|
||||||
/**
|
/**
|
||||||
* @var $bo class bocal
|
* instance of the bocal or bocalupdate class
|
||||||
|
*
|
||||||
|
* @var bocalupdate
|
||||||
*/
|
*/
|
||||||
var $bo,$jscal,$html,$datetime,$cats,$accountsel;
|
var $bo;
|
||||||
|
/**
|
||||||
|
* instance of jscalendar
|
||||||
|
*
|
||||||
|
* @var jscalendar
|
||||||
|
*/
|
||||||
|
var $jscal;
|
||||||
|
/**
|
||||||
|
* Reference to global html class
|
||||||
|
*
|
||||||
|
* @var html
|
||||||
|
*/
|
||||||
|
var $html;
|
||||||
|
/**
|
||||||
|
* Reference to global datetime class
|
||||||
|
*
|
||||||
|
* @var datetime
|
||||||
|
*/
|
||||||
|
var $datetime;
|
||||||
|
/**
|
||||||
|
* Reference to global categories class
|
||||||
|
*
|
||||||
|
* @var categories
|
||||||
|
*/
|
||||||
|
var $cats;
|
||||||
|
/**
|
||||||
|
* Reference to global uiaccountsel class
|
||||||
|
*
|
||||||
|
* @var uiaccountsel
|
||||||
|
*/
|
||||||
|
var $accountsel;
|
||||||
/**
|
/**
|
||||||
* @var array $common_prefs reference to $GLOBALS['egw_info']['user']['preferences']['common']
|
* @var array $common_prefs reference to $GLOBALS['egw_info']['user']['preferences']['common']
|
||||||
*/
|
*/
|
||||||
@ -621,8 +653,7 @@ class uical
|
|||||||
}
|
}
|
||||||
*/
|
*/
|
||||||
// Calendarselection: User or Group
|
// Calendarselection: User or Group
|
||||||
if(count($this->bo->grants) > 0 && (!isset($GLOBALS['egw_info']['server']['deny_user_grants_access']) ||
|
if(count($this->bo->grants) > 0 && $this->accountsel->account_selection != 'none')
|
||||||
!$GLOBALS['egw_info']['server']['deny_user_grants_access']))
|
|
||||||
{
|
{
|
||||||
$grants = array();
|
$grants = array();
|
||||||
foreach($this->bo->list_cals() as $grant)
|
foreach($this->bo->list_cals() as $grant)
|
||||||
|
@ -40,6 +40,12 @@ class uiforms extends uical
|
|||||||
'export' => true,
|
'export' => true,
|
||||||
'import' => true,
|
'import' => true,
|
||||||
);
|
);
|
||||||
|
/**
|
||||||
|
* Reference to link-class of bocal
|
||||||
|
*
|
||||||
|
* @var bolink
|
||||||
|
*/
|
||||||
|
var $link;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Standard durations used in edit and freetime search
|
* Standard durations used in edit and freetime search
|
||||||
@ -730,7 +736,8 @@ class uiforms extends uical
|
|||||||
}
|
}
|
||||||
// disabling the custom fields tab, if there are none
|
// disabling the custom fields tab, if there are none
|
||||||
$readonlys['general|description|participants|recurrence|custom|links|alarms'] = array(
|
$readonlys['general|description|participants|recurrence|custom|links|alarms'] = array(
|
||||||
'custom' => !count($this->bo->config['customfields'])
|
'custom' => !count($this->bo->config['customfields']),
|
||||||
|
'participants' => $this->accountsel->account_selection == 'none',
|
||||||
);
|
);
|
||||||
if ($view || !isset($GLOBALS['egw_info']['user']['apps']['felamimail']))
|
if ($view || !isset($GLOBALS['egw_info']['user']['apps']['felamimail']))
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user