From f9bbcdeb86854d3ea4290eda2040b7e3290c47cc Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Tue, 17 Jan 2017 18:24:56 +0100 Subject: [PATCH] * Timesheet/Resources/Filemanager/Calendar: customfields could not be deleted --- admin/inc/class.admin_customfields.inc.php | 3 ++- calendar/inc/class.calendar_hooks.inc.php | 2 +- filemanager/inc/class.filemanager_hooks.inc.php | 2 +- resources/inc/class.resources_hooks.inc.php | 2 +- timesheet/inc/class.timesheet_hooks.inc.php | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/admin/inc/class.admin_customfields.inc.php b/admin/inc/class.admin_customfields.inc.php index 3252622163..53850f0b21 100644 --- a/admin/inc/class.admin_customfields.inc.php +++ b/admin/inc/class.admin_customfields.inc.php @@ -271,7 +271,8 @@ class admin_customfields // Some logic to make sure extending class (if there is one) gets called // when etemplate2 comes back instead of parent class - $exec = get_class() == get_called_class() ? 'admin.admin_customfields.index' : $this->appname . '.' . get_called_class() . '.index'; + $exec = get_class() == get_called_class() || get_called_class() == 'customfields' ? + 'admin.admin_customfields.index' : $this->appname . '.' . get_called_class() . '.index'; $this->tmpl->exec($exec,$content,$sel_options,$readonlys,$preserve); } diff --git a/calendar/inc/class.calendar_hooks.inc.php b/calendar/inc/class.calendar_hooks.inc.php index 972f4332c8..3cd3d4e14a 100644 --- a/calendar/inc/class.calendar_hooks.inc.php +++ b/calendar/inc/class.calendar_hooks.inc.php @@ -85,7 +85,7 @@ class calendar_hooks { $file = Array( 'Site Configuration' => Egw::link('/index.php','menuaction=admin.admin_config.index&appname=calendar&ajax=true'), - 'Custom fields' => Egw::link('/index.php','menuaction=admin.customfields.index&appname=calendar&ajax=true'), + 'Custom fields' => Egw::link('/index.php','menuaction=admin.admin_customfields.index&appname=calendar&ajax=true'), 'Global Categories' => Egw::link('/index.php','menuaction=admin.admin_categories.index&appname=calendar&ajax=true'), 'Category ACL' => Egw::link('/index.php','menuaction=calendar.calendar_uiforms.cat_acl'), 'Update timezones' => Egw::link('/index.php','menuaction=calendar.calendar_timezones.update'), diff --git a/filemanager/inc/class.filemanager_hooks.inc.php b/filemanager/inc/class.filemanager_hooks.inc.php index 1a0d20f231..4186c3cd0b 100644 --- a/filemanager/inc/class.filemanager_hooks.inc.php +++ b/filemanager/inc/class.filemanager_hooks.inc.php @@ -97,7 +97,7 @@ class filemanager_hooks $file = Array( //'Site Configuration' => Egw::link('/index.php','menuaction=admin.admin_config.index&appname='.self::$appname.'&ajax=true'), - 'Custom fields' => Egw::link('/index.php','menuaction=admin.customfields.index&appname='.self::$appname.'&ajax=true'), + 'Custom fields' => Egw::link('/index.php','menuaction=admin.admin_customfields.index&appname='.self::$appname.'&ajax=true'), 'Check virtual filesystem' => Egw::link('/index.php','menuaction=filemanager.filemanager_admin.fsck'), 'VFS mounts and versioning' => Egw::link('/index.php', 'menuaction=filemanager.filemanager_admin.index'), ); diff --git a/resources/inc/class.resources_hooks.inc.php b/resources/inc/class.resources_hooks.inc.php index ded90edce6..0ade26fcdb 100644 --- a/resources/inc/class.resources_hooks.inc.php +++ b/resources/inc/class.resources_hooks.inc.php @@ -63,7 +63,7 @@ class resources_hooks 'Configure Access Permissions' => Egw::link('/index.php', 'menuaction=resources.resources_acl_ui.index&ajax=true'), 'Custom Fields'=>egw::link('/index.php', - 'menuaction=admin.customfields.index&appname=resources&ajax=true'), + 'menuaction=admin.admin_customfields.index&appname=resources&ajax=true'), ); if ($location == 'admin') { diff --git a/timesheet/inc/class.timesheet_hooks.inc.php b/timesheet/inc/class.timesheet_hooks.inc.php index 18c5920b1b..19494e274e 100644 --- a/timesheet/inc/class.timesheet_hooks.inc.php +++ b/timesheet/inc/class.timesheet_hooks.inc.php @@ -133,7 +133,7 @@ class timesheet_hooks { $file = Array( 'Site Configuration' => Egw::link('/index.php','menuaction=admin.admin_config.index&appname=' . $appname,'&ajax=true'), - 'Custom fields' => Egw::link('/index.php','menuaction=admin.customfields.index&appname='.$appname.'&use_private=1&ajax=true'), + 'Custom fields' => Egw::link('/index.php','menuaction=admin.admin_customfields.index&appname='.$appname.'&use_private=1&ajax=true'), 'Global Categories' => Egw::link('/index.php',array( 'menuaction' => 'admin.admin_categories.index', 'appname' => $appname,