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

Rename ID field to Resource ID to deal with Excel issue

Browse Source
This commit is contained in:
Nathan Gray 2011-03-28 17:03:53 +00:00
parent 4d5105806d
commit 01fa7e080a
4 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/inc/class.resources_wizard_export_csv.inc.php
View File

@ -17,7 +17,7 @@ class resources_wizard_export_csv extends importexport_wizard_basic_export_csv
// Field mapping // Field mapping
$this->export_fields = array( $this->export_fields = array(
'res_id' => lang('ID'), 'res_id' => lang('Resource ID'),
'name' => lang('name'), 'name' => lang('name'),
'short_description' => lang('short description'), 'short_description' => lang('short description'),
'cat_id' => lang('Category'), 'cat_id' => lang('Category'),

2
resources/inc/class.resources_wizard_import_csv.inc.php
View File

@ -27,7 +27,7 @@ class resources_wizard_import_csv extends importexport_wizard_basic_import_csv
// Field mapping // Field mapping
$export = new resources_wizard_export_csv(); $export = new resources_wizard_export_csv();
$this->mapping_fields = array( $this->mapping_fields = array(
'res_id' => lang('ID'), 'res_id' => lang('Resource ID'),
'name' => lang('name'), 'name' => lang('name'),
'short_description' => lang('short description'), 'short_description' => lang('short description'),
'cat_id' => lang('Category'), 'cat_id' => lang('Category'),

1
resources/lang/egw_en.lang
View File

@ -69,6 +69,7 @@ quantity: resources en Quantity:
read calendar permissions resources en Read Calendar permissions read calendar permissions resources en Read Calendar permissions
read permissions resources en Read permissions read permissions resources en Read permissions
related links resources en Related links related links resources en Related links
resource id resources en Resource ID
resources common en Resources resources common en Resources
resources list resources en Resources list resources list resources en Resources list
responsible: resources en Responsible: responsible: resources en Responsible:

33
resources/setup/importexport_default.xml
View File

@ -16,7 +16,7 @@
</entry> </entry>
<entry type="array" name="plugin_options"> <entry type="array" name="plugin_options">
<entry type="array" name="mapping"> <entry type="array" name="mapping">
<entry type="string" name="res_id">ID</entry> <entry type="string" name="res_id">Resource ID</entry>
<entry type="string" name="name">Name</entry> <entry type="string" name="name">Name</entry>
<entry type="string" name="short_description">Short description</entry> <entry type="string" name="short_description">Short description</entry>
<entry type="string" name="cat_id">Category</entry> <entry type="string" name="cat_id">Category</entry>
@ -35,7 +35,7 @@
<entry type="string" name="begin_with_fieldnames">label</entry> <entry type="string" name="begin_with_fieldnames">label</entry>
<entry type="string" name="convert">1</entry> <entry type="string" name="convert">1</entry>
</entry> </entry>
<entry type="string" name="modified">2011-03-02 10:17:41</entry> <entry type="string" name="modified">2011-03-28 10:59:50</entry>
</entry> </entry>
<entry type="array" name="import-resources"> <entry type="array" name="import-resources">
<entry type="string" name="name">import-resources</entry> <entry type="string" name="name">import-resources</entry>
@ -51,20 +51,19 @@
<entry type="string" name="num_header_lines">1</entry> <entry type="string" name="num_header_lines">1</entry>
<entry type="string" name="update_cats">add</entry> <entry type="string" name="update_cats">add</entry>
<entry type="array" name="csv_fields"> <entry type="array" name="csv_fields">
<entry type="string" name="0">name</entry> <entry type="string" name="0">Resource ID</entry>
<entry type="string" name="1">short_description</entry> <entry type="string" name="1">Name</entry>
<entry type="string" name="2">cat_id</entry> <entry type="string" name="2">Short description</entry>
<entry type="string" name="3">quantity</entry> <entry type="string" name="3">Category</entry>
<entry type="string" name="4">useable</entry> <entry type="string" name="4">Quantity</entry>
<entry type="string" name="5">location</entry> <entry type="string" name="5">useable</entry>
<entry type="string" name="6">bookable</entry> <entry type="string" name="6">Location</entry>
<entry type="string" name="7">buyable</entry> <entry type="string" name="7">Bookable</entry>
<entry type="string" name="8">prize</entry> <entry type="string" name="8">Buyable</entry>
<entry type="string" name="9">long_description</entry> <entry type="string" name="9">Prize</entry>
<entry type="string" name="10">inventory_number</entry> <entry type="string" name="10">Long description</entry>
<entry type="string" name="11">no_csv_1</entry> <entry type="string" name="11">Inventory number</entry>
<entry type="string" name="12">no_csv_2</entry> <entry type="string" name="12">Test CF</entry>
<entry type="string" name="13">no_csv_3</entry>
</entry> </entry>
<entry type="array" name="field_mapping"> <entry type="array" name="field_mapping">
<entry type="string" name="0">res_id</entry> <entry type="string" name="0">res_id</entry>
@ -96,7 +95,7 @@
</entry> </entry>
</entry> </entry>
</entry> </entry>
<entry type="string" name="modified">2011-03-02 10:16:33</entry> <entry type="string" name="modified">2011-03-28 11:02:19</entry>
</entry> </entry>
</entry> </entry>
</entry> </entry>