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

Category command

Browse Source 
- Save original name for tracing if category is later deleted
- Skip some internal values (level, app_name)
- Nice history for delete category command
This commit is contained in:
nathangray 2019-03-20 10:33:10 -06:00
parent ec98f00ff1
commit 6afccb215b
2 changed files with 66 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
admin/inc/class.admin_cmd_category.inc.php
View File

@ -75,6 +75,9 @@ class admin_cmd_category extends admin_cmd
// store the cat
$this->cat_id = $this->set['id'] ? $cats->edit($this->set) : $cats->add($this->set);
// Put this there for posterity, if it gets deleted later
$this->cat_name = Api\Categories::id2name($this->cat_id);
// Clean data for history
$set =& $this->set;
$old =& $this->old;
@ -101,9 +104,15 @@ class admin_cmd_category extends admin_cmd
*/
function __tostring()
{
$current_name = Api\Categories::id2name($this->cat_id);
if($current_name !== $this->cat_name)
{
$current_name = $this->cat_name . ($current_name == '--' ?
'' : " ($current_name)");
}
return lang('%1 category \'%2\' %3',
lang($this->app),
Api\Categories::id2name($this->cat_id),
$current_name,
$this->old ? lang('edited') : lang('added')
);
}
@ -130,7 +139,7 @@ class admin_cmd_category extends admin_cmd
// Never seems to be in old value, so don't show it
$labels['icon_url'] = False;
// Just for internal use, no need to show it
$labels['main'] = False;
$labels['main'] = $labels['app_name'] = $labels['level'] = False;
return $labels;
}
@ -144,6 +153,7 @@ class admin_cmd_category extends admin_cmd
{
$widgets = parent::get_change_widgets();
unset($widgets['data[icon]']);
unset($widgets['data[color]']);
$widgets['data'] = array(
// Categories have non-standard image location, so image widget can't find them
// without being given the full path, which we don't have
@ -152,6 +162,7 @@ class admin_cmd_category extends admin_cmd
);
$widgets['parent'] = 'select-cat';
$widgets['owner'] = 'select-account';
$widgets['appname'] = 'select-app';
return $widgets;
}
}

53
admin/inc/class.admin_cmd_delete_category.inc.php
View File

@ -59,6 +59,10 @@ class admin_cmd_delete_category extends admin_cmd
protected function exec($check_only=false)
{
$cats = new Api\Categories('',$this->app);
if(!$this->old && $this->cat_id)
{
$this->old = $cats->read($this->cat_id);
}
if ($check_only)
{
return true;
@ -80,4 +84,53 @@ class admin_cmd_delete_category extends admin_cmd
{
return lang('Category \'%1\' deleted' , $this->data['cat_name']);
}
/**
* Get name of eTemplate used to make the change to derive UI for history
*
* @return string|null etemplate name
*/
protected function get_etemplate_name()
{
return 'admin.categories.edit';
}
/**
* Return (human readable) labels for keys of changes
*
* @return array
*/
function get_change_labels()
{
$labels = parent::get_change_labels();
// Never seems to be in old value, so don't show it
$labels['icon_url'] = False;
// Just for internal use, no need to show it
$labels['main'] = $labels['app_name'] = $labels['level'] = False;
return $labels;
}
/**
* Return widget types (indexed by field key) for changes
*
* Used by historylog widget to show the changes the command recorded.
*/
function get_change_widgets()
{
$widgets = parent::get_change_widgets();
unset($widgets['data[icon]']);
unset($widgets['data[color]']);
$widgets['data'] = array(
// Categories have non-standard image location, so image widget can't find them
// without being given the full path, which we don't have
'icon' => 'description',
'color' => 'colorpicker'
);
$widgets['parent'] = 'select-cat';
$widgets['owner'] = 'select-account';
$widgets['appname'] = 'select-app';
return $widgets;
}
}