extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 06:30:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add type and comment columns to command log

Browse Source
This commit is contained in:
nathangray 2018-10-09 11:13:06 -06:00
parent 9f6a7e3187
commit 522b30c62e
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
admin/inc/class.admin_cmds.inc.php
View File

@ -50,7 +50,7 @@ class admin_cmds
} }
$row['value'] = $cmd->value; $row['value'] = $cmd->value;
if(method_exists($cmd, 'summary')) if(method_exists($cmd, 'summary'))
{ {
$row['data'] = $cmd->summary(); $row['data'] = $cmd->summary();
@ -126,11 +126,14 @@ class admin_cmds
0 => 'no', 0 => 'no',
1 => 'yes' 1 => 'yes'
); );
$tpl->exec('admin.admin_cmds.index',$content,array( $sel_options = array(
'periodic' => $periodic, 'periodic' => $periodic,
'status' => admin_cmd::$stati, 'status' => admin_cmd::$stati,
'remote_id' => admin_cmd::remote_sites(), 'remote_id' => admin_cmd::remote_sites(),
),array(),$content); 'type' => admin_cmd::get_cmd_labels()
);
$tpl->exec('admin.admin_cmds.index',$content,$sel_options,array(),$content);
} }
/** /**

8
admin/templates/default/cmds.xet
View File

@ -15,11 +15,15 @@
<column width="30%" minWidth="120"/> <column width="30%" minWidth="120"/>
<column/> <column/>
<column/> <column/>
<column/>
<column/>
</columns> </columns>
<rows> <rows>
<row class="th"> <row class="th">
<nextmatch-header label="Title" id="title"/> <nextmatch-header label="Title" id="title"/>
<nextmatch-header label="Requested" id="requested"/> <nextmatch-filterheader empty_label="Type" id="type"/>
<nextmatch-accountfilter empty_label="Requested" id="requested"/>
<nextmatch-header label="Comment" id="comment"/>
<nextmatch-sortheader label="Scheduled" id="scheduled"/> <nextmatch-sortheader label="Scheduled" id="scheduled"/>
<nextmatch-filterheader empty_label="Periodic" id="periodic"/> <nextmatch-filterheader empty_label="Periodic" id="periodic"/>
<nextmatch-filterheader options="Remote" id="remote_id"/> <nextmatch-filterheader options="Remote" id="remote_id"/>
@ -31,7 +35,9 @@
</row> </row>
<row class="row $row_cont[class]"> <row class="row $row_cont[class]">
<description id="${row}[title]" statustext="$row_cont[data]"/> <description id="${row}[title]" statustext="$row_cont[data]"/>
<select id="${row}[type]" readonly="true"/>
<url-email id="${row}[requested_email]" readonly="true" statustext="$row_cont[comment]"/> <url-email id="${row}[requested_email]" readonly="true" statustext="$row_cont[comment]"/>
<description id="${row}[comment]"/>
<date-time id="${row}[scheduled]" readonly="true"/> <date-time id="${row}[scheduled]" readonly="true"/>
<description id="${row}[rrule]"/> <description id="${row}[rrule]"/>
<select id="${row}[remote_id]" readonly="true"/> <select id="${row}[remote_id]" readonly="true"/>