mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-24 17:04:14 +01:00
Fix some bugs in timesheet import:
- Missing owner step template - Missing message in owner step - Wrong call to array_key_exists
This commit is contained in:
parent
dee0caa875
commit
695317985e
@ -113,9 +113,9 @@ class timesheet_wizard_import_csv extends importexport_wizard_basic_import_csv
|
||||
);
|
||||
}
|
||||
$sel_options = array(
|
||||
'translate_status' => $options + array($set_to => $ui->status_labels),
|
||||
'translate_cat_id' => $options + array($set_to => $cat_list),
|
||||
);
|
||||
'translate_status' => $options + array($set_to => $ui->status_labels),
|
||||
'translate_cat_id' => $options + array($set_to => $cat_list),
|
||||
);
|
||||
$preserv = $content;
|
||||
foreach($sel_options as $field => $options) {
|
||||
if(!array_key_exists($field,$content)) $content[$field] = $content['plugin_options'][$field];
|
||||
@ -155,16 +155,16 @@ class timesheet_wizard_import_csv extends importexport_wizard_basic_import_csv
|
||||
// init step60
|
||||
else
|
||||
{
|
||||
$content['msg'] = $this->steps['wizard_step60'];
|
||||
$content['message'] = $this->steps['wizard_step60'];
|
||||
$content['step'] = 'wizard_step60';
|
||||
$preserv = $content;
|
||||
if(!array_key_exists($content['record_owner']) && $content['plugin_options']) {
|
||||
if(!array_key_exists('record_owner', $content) && $content['plugin_options']) {
|
||||
$content['record_owner'] = $content['plugin_options']['record_owner'];
|
||||
}
|
||||
if(!array_key_exists($content['owner_from_csv']) && $content['plugin_options']) {
|
||||
if(!array_key_exists('owner_from_csv', $content) && $content['plugin_options']) {
|
||||
$content['owner_from_csv'] = $content['plugin_options']['owner_from_csv'];
|
||||
}
|
||||
if(!array_key_exists($content['change_owner']) && $content['plugin_options']) {
|
||||
if(!array_key_exists('change_owner', $content) && $content['plugin_options']) {
|
||||
$content['change_owner'] = $content['plugin_options']['change_owner'];
|
||||
}
|
||||
|
||||
@ -173,7 +173,7 @@ class timesheet_wizard_import_csv extends importexport_wizard_basic_import_csv
|
||||
}
|
||||
|
||||
unset ($preserv['button']);
|
||||
return 'infolog.importexport_wizard_chooseowner';
|
||||
return 'timesheet.importexport_wizard_chooseowner';
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -0,0 +1,33 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE overlay PUBLIC "-//Stylite AG//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
|
||||
<!-- $Id$ -->
|
||||
<overlay>
|
||||
<template id="timesheet.importexport_wizard_chooseowner" template="" lang="" group="0" version="1.9.002">
|
||||
<grid>
|
||||
<columns>
|
||||
<column/>
|
||||
</columns>
|
||||
<rows>
|
||||
<row>
|
||||
<description id="msg" no_lang="1"/>
|
||||
</row>
|
||||
<row class="th">
|
||||
<description value="Owner"/>
|
||||
</row>
|
||||
<row disabled="@no_owner_map">
|
||||
<checkbox label="Use field from CSV if possible" id="owner_from_csv"/>
|
||||
</row>
|
||||
<row>
|
||||
<menulist>
|
||||
<menupopup type="select-account" id="record_owner" options="Select"/>
|
||||
</menulist>
|
||||
</row>
|
||||
<row>
|
||||
<menulist>
|
||||
<menupopup type="select-bool" label="Change owner when updating" id="change_owner"/>
|
||||
</menulist>
|
||||
</row>
|
||||
</rows>
|
||||
</grid>
|
||||
</template>
|
||||
</overlay>
|
Loading…
Reference in New Issue
Block a user