From e88c042901e23f88a26943d26f7762d5755570b2 Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Mon, 14 Nov 2011 17:03:11 +0000 Subject: [PATCH] Add custom fields to available fields and default export definition --- calendar/inc/class.calendar_wizard_import_csv.inc.php | 7 +++++++ calendar/setup/importexport_default.xml | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/calendar/inc/class.calendar_wizard_import_csv.inc.php b/calendar/inc/class.calendar_wizard_import_csv.inc.php index e7c50a8f69..c1629305b2 100644 --- a/calendar/inc/class.calendar_wizard_import_csv.inc.php +++ b/calendar/inc/class.calendar_wizard_import_csv.inc.php @@ -28,6 +28,13 @@ class calendar_wizard_import_csv extends importexport_wizard_basic_import_csv $tracking = new calendar_tracking(); $this->mapping_fields = array('id' => 'Calendar ID') + $tracking->field2label; + // List each custom field + unset($this->mapping_fields['customfields']); + $custom = config::get_customfields('calendar'); + foreach($custom as $name => $data) { + $this->mapping_fields['#'.$name] = $data['label']; + } + // Actions $this->actions = array( 'none' => lang('none'), diff --git a/calendar/setup/importexport_default.xml b/calendar/setup/importexport_default.xml index 57ec33db00..da8f25f8df 100644 --- a/calendar/setup/importexport_default.xml +++ b/calendar/setup/importexport_default.xml @@ -34,13 +34,14 @@ end Participants: User, Status, Role Participants: User, Status, Quantity, Role + calendar ; user label 1 - 2011-05-24 10:00:00 + 2011-11-10 10:00:00 import-calendar-ical