Author: nathangray
New Revision: 32139
URL: http://www.egroupware.org/viewvc/egroupware?rev=32139&view=rev
Log:
Backport 32138 - Change UI a little to have actions default to ‘Select’ when no action is selected
Modified:
branches/1.8/importexport/inc/class.importexport_wizard_basic_import_csv.inc.php
branches/1.8/importexport/setup/etemplates.inc.php
Modified: branches/1.8/importexport/inc/class.importexport_wizard_basic_import_csv.inc.php
URL: http://www.egroupware.org/viewvc/egroupware/branches/1.8/importexport/inc/class.importexport_wizard_basic_import_csv.inc.php?rev=32139&r1=32138&r2=32139&view=diff
— branches/1.8/importexport/inc/class.importexport_wizard_basic_import_csv.inc.php (original)
+++ branches/1.8/importexport/inc/class.importexport_wizard_basic_import_csv.inc.php Thu Sep 16 19:21:13 2010
@@ -269,8 +269,8 @@
// Clear conditions that don't do anything
foreach($content['conditions'] as $key => $condition) {
-
if($condition['true']['action'] == 'none' && !$condition['true']['stop'] -
&& $condition['false']['action'] == 'none' && !$condition['false']['stop']) {
-
if(($condition['true']['action'] == 'none' || !$condition['true']['action']) && !$condition['true']['stop'] -
&& ($condition['false']['action'] == 'none' || !$condition['false']['action']) && !$condition['false']['stop']) { unset($content['conditions'][$key]); } }
Modified: branches/1.8/importexport/setup/etemplates.inc.php
URL: http://www.egroupware.org/viewvc/egroupware/branches/1.8/importexport/setup/etemplates.inc.php?rev=32139&r1=32138&r2=32139&view=diff
— branches/1.8/importexport/setup/etemplates.inc.php (original)
+++ branches/1.8/importexport/setup/etemplates.inc.php Thu Sep 16 19:21:13 2010
@@ -2,7 +2,7 @@
/**
* eGroupWare - eTemplates for Application importexport
* http://www.egroupware.org
-
- generated by soetemplate::dump4setup() 2010-09-08 18:23
-
- generated by soetemplate::dump4setup() 2010-09-16 11:13
- @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
-
@package importexport
@@ -61,7 +61,7 @@
$templ_data[] = array(‘name’ => ‘importexport.wizard_basic_import_csv.choosesepncharset’,‘template’ => ‘’,‘lang’ => ‘’,‘group’ => ‘0’,‘version’ => ‘0.0.1’,‘data’ => ‘a:1:{i:0;a:4:{s:4:“type”;s:4:“grid”;s:4:“data”;a:5:{i:0;a:1:{s:1:“B”;s:5:“180px”;}i:1;a:2:{s:1:“A”;a:4:{s:4:“type”;s:5:“label”;s:7:“no_lang”;s:1:“1”;s:4:“name”;s:3:“msg”;s:4:“span”;s:3:“all”;}s:1:“B”;a:1:{s:4:“type”;s:5:“label”;}}i:2;a:2:{s:1:“A”;a:2:{s:4:“type”;s:5:“label”;s:5:“label”;s:14:“Fieldseperator”;}s:1:“B”;a:4:{s:4:“type”;s:4:“text”;s:7:“no_lang”;s:1:“1”;s:4:“name”;s:8:“fieldsep”;s:4:“size”;s:1:“1”;}}i:3;a:2:{s:1:“A”;a:2:{s:4:“type”;s:5:“label”;s:5:“label”;s:15:“Charset of file”;}s:1:“B”;a:4:{s:4:“type”;s:6:“select”;s:7:“no_lang”;s:1:“1”;s:4:“name”;s:7:“charset”;s:4:“span”;s:9:",width180";}}i:4;a:2:{s:1:“A”;a:2:{s:4:“type”;s:5:“label”;s:5:“label”;s:20:“Header lines to skip”;}s:1:“B”;a:3:{s:4:“type”;s:3:“int”;s:4:“name”;s:16:“num_header_lines”;s:4:“size”;s:1:“0”;}}}s:4:“rows”;i:4;s:4:“cols”;i:2;}}’,‘siz
e’ => ‘’,‘style’ => ‘.width180 select { width:150px;}’,‘modified’ => ‘1268236708’,);
-$templ_data[] = array(‘name’ => ‘importexport.wizard_basic_import_csv.conditions’,‘template’ => ‘’,‘lang’ => ‘’,‘group’ => ‘0’,‘version’ => ‘0.01’,‘data’ => ‘a:1:{i:0;a:7:{s:4:“type”;s:4:“vbox”;s:4:“data”;a:2:{i:0;a:0:{}i:1;a:4:{s:1:“A”;a:2:{s:4:“type”;s:6:“select”;s:4:“name”;s:14:"${row}[string]";}s:1:“B”;a:4:{s:4:“type”;s:4:“hbox”;s:4:“size”;s:6:“2,0,0”;i:1;a:2:{s:4:“type”;s:6:“select”;s:4:“name”;s:12:"${row}[type]";}i:2;a:2:{s:4:“type”;s:4:“text”;s:4:“name”;s:12:"${row}[op_2]";}}s:1:“C”;a:2:{s:4:“type”;s:6:“select”;s:4:“name”;s:12:"${row}[true]";}s:1:“D”;a:2:{s:4:“type”;s:6:“select”;s:4:“name”;s:13:"${row}[false]";}}}s:4:“rows”;i:1;s:4:“cols”;i:4;s:4:“size”;s:1:“2”;i:1;a:6:{s:4:“type”;s:4:“grid”;s:4:“data”;a:3:{i:0;a:1:{s:2:“c1”;s:2:“th”;}i:1;a:6:{s:1:“A”;a:2:{s:4:“type”;s:5:“label”;s:5:“label”;s:5:“Field”;}s:1:“B”;a:2:{s:4:“type”;s:5:“label”;s:5:“label”;s:9:“Condition”;}s:1:“C”;a:5:{s:4:“type”;s:4:“vbox”;s:4:“size”;s:1:“2”;s:4:“span”;s:1:“2”;i:1;a:4:{s:4:“type”;s:5:“lab
el”;s:4:“span”;s:1:“2”;s:5:“label”;s:4:“True”;s:5:“align”;s:6:“center”;}i:2;a:4:{s:4:“type”;s:4:“hbox”;s:4:“size”;s:6:“2,2,0”;i:1;a:2:{s:4:“type”;s:5:“label”;s:5:“label”;s:6:“Action”;}i:2;a:3:{s:4:“type”;s:5:“label”;s:5:“label”;s:4:“Stop”;s:5:“align”;s:5:“right”;}}}s:1:“D”;a:1:{s:4:“type”;s:5:“label”;}s:1:“E”;a:5:{s:4:“type”;s:4:“vbox”;s:4:“size”;s:1:“2”;s:4:“span”;s:1:“2”;i:1;a:4:{s:4:“type”;s:5:“label”;s:4:“span”;s:1:“2”;s:5:“label”;s:5:“False”;s:5:“align”;s:6:“center”;}i:2;a:4:{s:4:“type”;s:4:“hbox”;s:4:“size”;s:6:“2,2,0”;i:1;a:2:{s:4:“type”;s:5:“label”;s:5:“label”;s:6:“Action”;}i:2;a:3:{s:4:“type”;s:5:“label”;s:5:“label”;s:4:“Stop”;s:5:“align”;s:5:“right”;}}}s:1:“F”;a:1:{s:4:“type”;s:5:“label”;}}i:2;a:6:{s:1:“A”;a:2:{s:4:“type”;s:6:“select”;s:4:“name”;s:14:"${row}[string]";}s:1:“B”;a:4:{s:4:“type”;s:4:“hbox”;s:4:“size”;s:6:“2,0,0”;i:1;a:2:{s:4:“type”;s:6:“select”;s:4:“name”;s:12:"${row}[type]";}i:2;a:2:{s:4:“type”;s:4:“text”;s:4:“name”;s:12:"${row}[op_2]";}}s:1:“C”;a:
2:{s:4:“type”;s:6:“select”;s:4:“name”;s:20:"${row}[true][action]";}s:1:“D”;a:3:{s:4:“type”;s:8:“checkbox”;s:5:“align”;s:6:“center”;s:4:“name”;s:18:"${row}[true][stop]";}s:1:“E”;a:2:{s:4:“type”;s:6:“select”;s:4:“name”;s:21:"${row}[false][action]";}s:1:“F”;a:3:{s:4:“type”;s:8:“checkbox”;s:5:“align”;s:6:“center”;s:4:“name”;s:19:"${row}[false][stop]";}}}s:4:“rows”;i:2;s:4:“cols”;i:6;s:4:“name”;s:10:“conditions”;s:7:“options”;a:0:{}}i:2;a:5:{s:4:“type”;s:6:“button”;s:4:“name”;s:3:“add”;s:5:“label”;s:3:“add”;s:4:“help”;s:59:“This causes a segfault… haven’t figured out how to fix it”;s:8:“disabled”;s:1:“1”;}}}’,‘size’ => ‘’,‘style’ => ‘’,‘modified’ => ‘1268236762’,);
+$templ_data[] = array(‘name’ => ‘importexport.wizard_basic_import_csv.conditions’,‘template’ => ‘’,‘lang’ => ‘’,‘group’ => ‘0’,‘version’ => ‘0.01’,‘data’ => ‘a:1:{i:0;a:7:{s:4:“type”;s:4:“vbox”;s:4:“data”;a:2:{i:0;a:0:{}i:1;a:4:{s:1:“A”;a:2:{s:4:“type”;s:6:“select”;s:4:“name”;s:14:"${row}[string]";}s:1:“B”;a:4:{s:4:“type”;s:4:“hbox”;s:4:“size”;s:6:“2,0,0”;i:1;a:2:{s:4:“type”;s:6:“select”;s:4:“name”;s:12:"${row}[type]";}i:2;a:2:{s:4:“type”;s:4:“text”;s:4:“name”;s:12:"${row}[op_2]";}}s:1:“C”;a:2:{s:4:“type”;s:6:“select”;s:4:“name”;s:12:"${row}[true]";}s:1:“D”;a:2:{s:4:“type”;s:6:“select”;s:4:“name”;s:13:"${row}[false]";}}}s:4:“rows”;i:1;s:4:“cols”;i:4;s:4:“size”;s:1:“2”;i:1;a:6:{s:4:“type”;s:4:“grid”;s:4:“data”;a:3:{i:0;a:1:{s:2:“c1”;s:2:“th”;}i:1;a:6:{s:1:“A”;a:2:{s:4:“type”;s:5:“label”;s:5:“label”;s:5:“Field”;}s:1:“B”;a:2:{s:4:“type”;s:5:“label”;s:5:“label”;s:9:“Condition”;}s:1:“C”;a:5:{s:4:“type”;s:4:“vbox”;s:4:“size”;s:1:“2”;s:4:“span”;s:1:“2”;i:1;a:4:{s:4:“type”;s:5:“lab
el”;s:4:“span”;s:1:“2”;s:5:“label”;s:4:“True”;s:5:“align”;s:6:“center”;}i:2;a:4:{s:4:“type”;s:4:“hbox”;s:4:“size”;s:6:“2,2,0”;i:1;a:2:{s:4:“type”;s:5:“label”;s:5:“label”;s:6:“Action”;}i:2;a:3:{s:4:“type”;s:5:“label”;s:5:“label”;s:4:“Stop”;s:5:“align”;s:5:“right”;}}}s:1:“D”;a:1:{s:4:“type”;s:5:“label”;}s:1:“E”;a:5:{s:4:“type”;s:4:“vbox”;s:4:“size”;s:1:“2”;s:4:“span”;s:1:“2”;i:1;a:4:{s:4:“type”;s:5:“label”;s:4:“span”;s:1:“2”;s:5:“label”;s:5:“False”;s:5:“align”;s:6:“center”;}i:2;a:4:{s:4:“type”;s:4:“hbox”;s:4:“size”;s:6:“2,2,0”;i:1;a:2:{s:4:“type”;s:5:“label”;s:5:“label”;s:6:“Action”;}i:2;a:3:{s:4:“type”;s:5:“label”;s:5:“label”;s:4:“Stop”;s:5:“align”;s:5:“right”;}}}s:1:“F”;a:1:{s:4:“type”;s:5:“label”;}}i:2;a:6:{s:1:“A”;a:2:{s:4:“type”;s:6:“select”;s:4:“name”;s:14:"${row}[string]";}s:1:“B”;a:4:{s:4:“type”;s:4:“hbox”;s:4:“size”;s:6:“2,0,0”;i:1;a:2:{s:4:“type”;s:6:“select”;s:4:“name”;s:12:"${row}[type]";}i:2;a:2:{s:4:“type”;s:4:“text”;s:4:“name”;s:12:"${row}[op_2]";}}s:1:“C”;a:
3:{s:4:“type”;s:6:“select”;s:4:“name”;s:20:"${row}[true][action]";s:4:“size”;s:6:“Select”;}s:1:“D”;a:3:{s:4:“type”;s:8:“checkbox”;s:5:“align”;s:6:“center”;s:4:“name”;s:18:"${row}[true][stop]";}s:1:“E”;a:3:{s:4:“type”;s:6:“select”;s:4:“name”;s:21:"${row}[false][action]";s:4:“size”;s:6:“Select”;}s:1:“F”;a:3:{s:4:“type”;s:8:“checkbox”;s:5:“align”;s:6:“center”;s:4:“name”;s:19:"${row}[false][stop]";}}}s:4:“rows”;i:2;s:4:“cols”;i:6;s:4:“name”;s:10:“conditions”;s:7:“options”;a:0:{}}i:2;a:5:{s:4:“type”;s:6:“button”;s:4:“name”;s:3:“add”;s:5:“label”;s:3:“add”;s:4:“help”;s:59:“This causes a segfault… haven’t figured out how to fix it”;s:8:“disabled”;s:1:“1”;}}}’,‘size’ => ‘’,‘style’ => ‘’,‘modified’ => ‘1268236762’,);
$templ_data[] = array(‘name’ => ‘importexport.wizard_basic_import_csv.fieldmapping’,‘template’ => ‘’,‘lang’ => ‘’,‘group’ => ‘0’,‘version’ => ‘0.0.1’,‘data’ => ‘a:1:{i:0;a:4:{s:4:“type”;s:4:“grid”;s:4:“data”;a:3:{i:0;a:0:{}i:1;a:1:{s:1:“A”;a:4:{s:4:“type”;s:5:“label”;s:7:“no_lang”;s:1:“1”;s:4:“name”;s:3:“msg”;s:4:“span”;s:3:“all”;}}i:2;a:1:{s:1:“A”;a:6:{s:4:“type”;s:4:“grid”;s:4:“data”;a:3:{i:0;a:1:{s:2:“c1”;s:2:“th”;}i:1;a:4:{s:1:“A”;a:1:{s:4:“type”;s:5:“label”;}s:1:“B”;a:2:{s:4:“type”;s:5:“label”;s:5:“label”;s:9:“CSV Field”;}s:1:“C”;a:2:{s:4:“type”;s:5:“label”;s:5:“label”;s:12:“Target Field”;}s:1:“D”;a:2:{s:4:“type”;s:5:“label”;s:5:“label”;s:11:“Translation”;}}i:2;a:4:{s:1:“A”;a:3:{s:4:“type”;s:5:“label”;s:5:“label”;s:6:"${row}";s:7:“no_lang”;s:1:“1”;}s:1:“B”;a:3:{s:4:“type”;s:5:“label”;s:4:“name”;s:16:“csv_fields[$row]”;s:7:“no_lang”;s:1:“1”;}s:1:“C”;a:3:{s:4:“type”;s:6:“select”;s:7:“no_lang”;s:1:“1”;s:4:“name”;s:19:“field_mapping[$row]”;}s:1:“D”;a:2:{s:4:“type”;s:4:“text
”;s:4:“name”;s:22:“field_conversion[$row]”;}}}s:4:“rows”;i:2;s:4:“cols”;i:4;s:4:“size”;s:10:",auto";s:7:“options”;a:1:{i:6;s:4:“auto”;}}}}s:4:“rows”;i:2;s:4:“cols”;i:1;}}’,‘size’ => ‘’,‘style’ => ‘’,‘modified’ => ‘1268236373’,);
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing.
http://p.sf.net/sfu/novell-sfdev2dev
eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs