Author: nathangray
Date: Mon Apr 18 22:01:07 2016
New Revision: 55767
URL: http://svn.stylite.de/viewvc/egroupware?rev=55767&view=rev
Log:
Remove invalid participant fields from export field options
Modified:
branches/14.2/calendar/ (props changed)
branches/14.2/calendar/inc/class.calendar_wizard_export_csv.inc.php
branches/14.2/calendar/setup/importexport_default.xml
Propchange: branches/14.2/calendar/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 18 22:01:07 2016
@@ -1,2 +1,2 @@
/branches/Stylite-EPL-11.1/calendar:51445
-/trunk/calendar:51362,51371,51376,51394,51400,51456,51474,51540,51547,51569,51573,51592,51596,51614,51812,51817,51844,51846,51848,51850,51901,51936,51953,52018,52020,52060,52085,52114,52116,52118-52119,52216,52249,52252,52284,52338,52347,52362,52408,52413,52416,52434,52463,52469,52506,52509,52536,52593,52658,52672,52695,52834,52931,52933,52971-52973,52983-52988,53008,53084,53087,53116,53118,53120,53146-53147,53155,53176,53178,53194,53258,53421,53496,53500,53534,53536,53577,53620,53668,53703,53724-53725,53742,53752,53755,53757,53759,53781-53782,53833,53836,53870,53892,53894,53900,53910,53950,53989,54152,54154,54201,54225,54263,54273,54275,54287,54335,54367,54376,54557-54558,54691,54741,54754,54887,55051,55344
+/trunk/calendar:51362,51371,51376,51394,51400,51456,51474,51540,51547,51569,51573,51592,51596,51614,51812,51817,51844,51846,51848,51850,51901,51936,51953,52018,52020,52060,52085,52114,52116,52118-52119,52216,52249,52252,52284,52338,52347,52362,52408,52413,52416,52434,52463,52469,52506,52509,52536,52593,52658,52672,52695,52834,52931,52933,52971-52973,52983-52988,53008,53084,53087,53116,53118,53120,53146-53147,53155,53176,53178,53194,53258,53421,53496,53500,53534,53536,53577,53620,53668,53703,53724-53725,53742,53752,53755,53757,53759,53781-53782,53833,53836,53870,53892,53894,53900,53910,53950,53989,54152,54154,54201,54225,54263,54273,54275,54287,54335,54367,54376,54557-54558,54691,54741,54754,54887,55051,55344,55526
Modified: branches/14.2/calendar/inc/class.calendar_wizard_export_csv.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/branches/14.2/calendar/inc/class.calendar_wizard_export_csv.inc.php?rev=55767&r1=55766&r2=55767&view=diff
==============================================================================
--- branches/14.2/calendar/inc/class.calendar_wizard_export_csv.inc.php (original)
+++ branches/14.2/calendar/inc/class.calendar_wizard_export_csv.inc.php Mon Apr 18 22:01:07 2016
@@ -16,6 +16,11 @@
// Field mapping
$bo = new calendar_tracking();
$this->export_fields = array('id' => 'Calendar ID') + $bo->field2label;
+
+ // These are not valid:
+ unset($this->export_fields['participants-c']);
+ unset($this->export_fields['participants-r']);
+
$custom = config::get_customfields('calendar', true);
foreach($custom as $name => $data) {
$this->export_fields['#'.$name] = $data['label'];
Modified: branches/14.2/calendar/setup/importexport_default.xml
URL: http://svn.stylite.de/viewvc/egroupware/branches/14.2/calendar/setup/importexport_default.xml?rev=55767&r1=55766&r2=55767&view=diff
==============================================================================
--- branches/14.2/calendar/setup/importexport_default.xml (original)
+++ branches/14.2/calendar/setup/importexport_default.xml Mon Apr 18 22:01:07 2016
@@ -33,7 +33,6 @@
<entry type="string" name="start">start</entry>
<entry type="string" name="end">end</entry>
<entry type="string" name="participants">Participants: User, Status, Role</entry>
- <entry type="string" name="participants-c">Participants: User, Status, Quantity, Role</entry>
<entry type="string" name="all_custom_fields">calendar</entry>
</entry>
<entry type="string" name="delimiter">;</entry>
------------------------------------------------------------------------------
Find and fix application performance issues faster with Applications Manager
Applications Manager provides deep performance insights into multiple tiers of
your business applications. It resolves application problems quickly and
reduces your MTTR. Get your free trial!
https://ad.doubleclick.net/ddm/clk/302982198;130105516;z
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.