Projekt

Allgemein

Profil

GX-Bug #53838 » CSVExportAdditionalImagesForAll1.patch

Till Tepelmann, 23.10.2017 10:57

Unterschiede anzeigen:

src/admin/html/content/export/export_scheme_configuration.html (revision )
155 155
								<div style="clear: both;"><!-- --></div>
156 156
							</div>
157 157
						{/block}
158
						{if $content_data.scheme->v_data_array.scheme_id === '1'}
159
							{block name="admin_export_scheme_configuration_options2_amount_additional_image_files"}
160
								<div class="row">
161
									<div class="span_1_3">
162
										<label for="conf_amount_additional_image_files">{$txt.amount_additional_image_files}:</label>
163
									</div>
164
									<div class="span_2_3">
165
										<input type="text" value="{$content_data.scheme->v_data_array.amount_additional_image_files|htmlentities_wrapper}" name="amount_additional_image_files" id="conf_amount_additional_image_files" title="{$txt.tooltip_amount_additional_image_files}" />
166
									</div>
167
									<div style="clear: both;"><!-- --></div>
168
								</div>
169
							{/block}
158
						{block name="admin_export_scheme_configuration_options2_amount_additional_image_files"}
159
							<div class="row">
160
								<div class="span_1_3">
161
									<label for="conf_amount_additional_image_files">{$txt.amount_additional_image_files}:</label>
162
								</div>
163
								<div class="span_2_3">
164
									<input type="text" value="{$content_data.scheme->v_data_array.amount_additional_image_files|htmlentities_wrapper}" name="amount_additional_image_files" id="conf_amount_additional_image_files" title="{$txt.tooltip_amount_additional_image_files}" />
165
								</div>
166
								<div style="clear: both;"><!-- --></div>
167
							</div>
168
						{/block}
170
						{/if}
171 169
					</div>
172 170
					<div class="span_1_2">
173 171
						{block name="admin_export_scheme_configuration_options2_customers_status"}
src/system/classes/csv/CSVFunctionLibrary.inc.php (revision )
1464 1464
	protected function _get_images_for_product($p_image_dir, $p_data_array)
1465 1465
	{
1466 1466
		$t_return = '';
1467
		if( isset( $p_data_array[ 'products_image' ] ) && !empty( $p_data_array[ 'products_image' ] ) )
1468
		{
1469
			$t_return .= $p_image_dir . $p_data_array['products_image'] . ', ';
1470
		}
1471
		
1467

  
1472 1468
		$this->_build_image_data_array();
1473 1469
		
1474 1470
		if(isset($this->v_image_data_array[$p_data_array['products_id']]))
......
1476 1472
			$imageCounter = 1;
1477 1473
			foreach($this->v_image_data_array[$p_data_array['products_id']] AS $t_image_array)
1478 1474
			{
1479
				if($imageCounter > (int)$this->coo_scheme->v_data_array['amount_additional_image_files']-1
1480
				   && $this->coo_scheme->v_data_array['scheme_id'] === '1'
1481
				)
1475
				if($imageCounter > (int)$this->coo_scheme->v_data_array['amount_additional_image_files'])
1482 1476
				{
1483 1477
					break;
1484 1478
				}
    (1-1/1)