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

- Disable filemanager link for integrated apps

Browse Source 
- Change timesheet icon on each row to popup, like Infolog does
This commit is contained in:
Nathan Gray 2010-04-27 18:36:18 +00:00
parent a2daa3f5cc
commit e4bb6099eb
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
calendar/inc/class.calendar_uilist.inc.php
View File

@ -339,6 +339,8 @@ class calendar_uilist extends calendar_ui
$readonlys['view['.$event['id'].']'] = !($readonlys['edit['.$event['id'].']'] = !$this->bo->check_perms(EGW_ACL_EDIT,$event)); $readonlys['view['.$event['id'].']'] = !($readonlys['edit['.$event['id'].']'] = !$this->bo->check_perms(EGW_ACL_EDIT,$event));
// Delete disabled for other applications // Delete disabled for other applications
$readonlys['delete['.$event['id'].']'] = !$this->bo->check_perms(EGW_ACL_DELETE,$event) || !is_numeric($event['id']); $readonlys['delete['.$event['id'].']'] = !$this->bo->check_perms(EGW_ACL_DELETE,$event) || !is_numeric($event['id']);
// Filemanager disabled for other applications
$readonlys['filemanager['.$event['id'].']'] = !is_numeric($event['id']);
$event['recure'] = $this->bo->recure2string($event); $event['recure'] = $this->bo->recure2string($event);
if ($params['csv_export']) if ($params['csv_export'])
@ -370,10 +372,13 @@ class calendar_uilist extends calendar_ui
} }
else else
{ {
//$icons = self::integration_get_icons($app,$app_id,$event); $icons = calendar_uiviews::integration_get_icons($app,$app_id,$event);
} }
} }
$event['app'] = 'calendar';
$event['app_id'] = $event['id'];
// Edit link // Edit link
if($app && $app_id) if($app && $app_id)
{ {
@ -381,6 +386,9 @@ class calendar_uilist extends calendar_ui
// Need to strip off 'onclick' // Need to strip off 'onclick'
$event['edit_link'] = preg_replace('/ ?onclick="(.+)"/i', '$1', $popup); $event['edit_link'] = preg_replace('/ ?onclick="(.+)"/i', '$1', $popup);
$event['app'] = $app;
$event['app_id'] = $app_id;
} }
elseif ($event['recur_type'] != MCAL_RECUR_NONE) elseif ($event['recur_type'] != MCAL_RECUR_NONE)
{ {

9
calendar/setup/etemplates.inc.php
View File

File diff suppressed because one or more lines are too long