[eGroupWare-svn] r55933 - in /branches/14.2: etemplate/inc/ importexport/inc/

Author: hnategh
Date: Fri Apr 29 11:53:12 2016
New Revision: 55933

URL: http://svn.stylite.de/viewvc/egroupware?rev=55933&view=rev
Log:
* Import/Export: Fix export with multi-select customfields does not work

Modified:
    branches/14.2/etemplate/inc/class.customfields_widget.inc.php
    branches/14.2/importexport/inc/class.importexport_widget_filter.inc.php

Modified: branches/14.2/etemplate/inc/class.customfields_widget.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/branches/14.2/etemplate/inc/class.customfields_widget.inc.php?rev=55933&r1=55932&r2=55933&view=diff
==============================================================================
--- branches/14.2/etemplate/inc/class.customfields_widget.inc.php (original)
+++ branches/14.2/etemplate/inc/class.customfields_widget.inc.php Fri Apr 29 11:53:12 2016
@@ -291,7 +291,7 @@
 						// and used as such.  All unknown values will be used for selection, not passed through to the query
 						if (isset($field['values']['@']))
 						{
-							$options['values'] = $this->_get_options_from_file($field['values']['@']);
+							$options['values'] = egw_customfields::_get_options_from_file($field['values']['@']);
 							unset($field['values']['@']);
 						} else {
 							$options['values'] = array_diff_key($field['values'], array_flip(ajax_select_widget::$known_options));
@@ -311,7 +311,7 @@
 						$showthis = '#a#l#l#';
 						if (count($field['values']) == 1 && isset($field['values']['@']))
 						{
-							$field['values'] = $this->_get_options_from_file($field['values']['@']);
+							$field['values'] = egw_customfields::_get_options_from_file($field['values']['@']);
 						}
 						if($this->advanced_search && $field['rows'] <= 1) $field['values'][''] = lang('doesn\'t matter');
 						if ($readonly)

Modified: branches/14.2/importexport/inc/class.importexport_widget_filter.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/branches/14.2/importexport/inc/class.importexport_widget_filter.inc.php?rev=55933&r1=55932&r2=55933&view=diff
==============================================================================
--- branches/14.2/importexport/inc/class.importexport_widget_filter.inc.php (original)
+++ branches/14.2/importexport/inc/class.importexport_widget_filter.inc.php Fri Apr 29 11:53:12 2016
@@ -25,11 +25,11 @@
 {
 
 	protected static $prefix = '';
-	
+
 	protected static $transformation = array(
 		'type' => 'customfields'
 	 );
-		
+
 	/**
 	 * Adapt the settings to custom fields widget
 	 *
@@ -64,15 +64,15 @@
 		self::$transformation['label'] = '';
 
 		$this->setElementAttribute($form_name, 'prefix', self::$prefix);
-		
+
 		$n = 1;
 		foreach($fields as $lname => &$field)
 		{
 			$type =& $field['type'];
-			
+
 			// No filters are required
 			$field['needed'] = false;
-			
+
 			switch($type)
 			{
 				case 'date':
@@ -109,14 +109,14 @@
 					// and used as such.  All unknown values will be used for selection, not passed through to the query
 					if (isset($field['values']['@']))
 					{
-						$options['values'] = $this->_get_options_from_file($field['values']['@']);
+						$options['values'] = egw_customfields::_get_options_from_file($field['values']['@']);
 						unset($field['values']['@']);
 					} else {
 						$options['values'] = array_diff_key($field['values'], array_flip(ajax_select_widget::$known_options));
 					}
 					$options = array_merge($options, array_intersect_key($field['values'], array_flip(ajax_select_widget::$known_options)));
 
-					
+
 					break;
 				case 'select':
 				default:
@@ -124,7 +124,7 @@
 					{
 						if (count($field['values']) == 1 && isset($field['values']['@']))
 						{
-							$field['values'] = $this->_get_options_from_file($field['values']['@']);
+							$field['values'] = egw_customfields::_get_options_from_file($field['values']['@']);
 						}
 						foreach((array)$field['values'] as $key => $val)
 						{
@@ -168,7 +168,7 @@
 			}
 			unset($widget);
 		}
-		
+
 		parent::beforeSendToClient($cname, $expand);
 
 		$this->setElementAttribute($form_name, 'customfields', $fields);
@@ -198,7 +198,7 @@
 		{
 			$input['sel_options'][$label] = lang($label);
 		}
-		
+
 		return $input;
 	}
 
@@ -214,14 +214,14 @@
 	protected static function do_absolute_date($lname, Array &$value, $options, $readonly)
 	{
 		$input = boetemplate::empty_cell('hbox',$lname);
-		
+
 		$type = 'date';
 		$from = boetemplate::empty_cell($type, $lname.'[from]',array(
 			'readonly'      => $readonly,
 			'no_lang'       => True,
 			'size'          => $options
 		));
-		
+
 		$to = boetemplate::empty_cell($type, $lname.'[to]', array(
 			'readonly'      => $readonly,
 			'no_lang'       => True,
@@ -235,8 +235,8 @@
 		boetemplate::add_child($input, $to);
 		return $input;
 	}
-	
-	
+
+
 	public function validate($cname, array $expand, array $content, &$validated=array())
 	{
 		$form_name = self::form_name($cname, $this->id, $expand);


------------------------------------------------------------------------------
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