@@ -291,8 +291,7 @@ |
||
291 | 291 | { |
292 | 292 | $propItem = $propItems[$entry['media.property.id']]; |
293 | 293 | unset( $propItems[$entry['media.property.id']] ); |
294 | - } |
|
295 | - else |
|
294 | + } else |
|
296 | 295 | { |
297 | 296 | $propItem = $propManager->createItem(); |
298 | 297 | } |
@@ -145,14 +145,12 @@ |
||
145 | 145 | } |
146 | 146 | |
147 | 147 | return; |
148 | - } |
|
149 | - catch( \Aimeos\MShop\Exception $e ) |
|
148 | + } catch( \Aimeos\MShop\Exception $e ) |
|
150 | 149 | { |
151 | 150 | $error = array( 'attribute-item-media' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
152 | 151 | $view->errors = $view->get( 'errors', [] ) + $error; |
153 | 152 | $this->logException( $e ); |
154 | - } |
|
155 | - catch( \Exception $e ) |
|
153 | + } catch( \Exception $e ) |
|
156 | 154 | { |
157 | 155 | $error = array( 'attribute-item-media' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() ); |
158 | 156 | $view->errors = $view->get( 'errors', [] ) + $error; |
@@ -121,9 +121,12 @@ discard block |
||
121 | 121 | <?= $enc->html( $this->translate( 'admin', 'Types for additional images like icons' ) ); ?> |
122 | 122 | </div> |
123 | 123 | </div> |
124 | - <?php else : ?> |
|
124 | + <?php else { |
|
125 | + : ?> |
|
125 | 126 | <input class="item-type" type="hidden" |
126 | - v-bind:name="'<?= $enc->attr( $this->formparam( array( 'media', 'idx', 'media.type' ) ) ); ?>'.replace( 'idx', idx )" |
|
127 | + v-bind:name="'<?= $enc->attr( $this->formparam( array( 'media', 'idx', 'media.type' ) ) ); |
|
128 | +} |
|
129 | +?>'.replace( 'idx', idx )" |
|
127 | 130 | value="<?= $enc->attr( key( $mediaTypes ) ); ?>" /> |
128 | 131 | <?php endif; ?> |
129 | 132 | |
@@ -201,9 +204,12 @@ discard block |
||
201 | 204 | <?= $enc->html( $this->translate( 'admin', 'Second level type for grouping items' ) ); ?> |
202 | 205 | </div> |
203 | 206 | </div> |
204 | - <?php else : ?> |
|
207 | + <?php else { |
|
208 | + : ?> |
|
205 | 209 | <input class="listitem-type" type="hidden" |
206 | - v-bind:name="'<?= $enc->attr( $this->formparam( array( 'media', 'idx', 'supplier.lists.type' ) ) ); ?>'.replace( 'idx', idx )" |
|
210 | + v-bind:name="'<?= $enc->attr( $this->formparam( array( 'media', 'idx', 'supplier.lists.type' ) ) ); |
|
211 | +} |
|
212 | +?>'.replace( 'idx', idx )" |
|
207 | 213 | value="<?= $enc->attr( key( $listTypes ) ); ?>" |
208 | 214 | v-model="items[idx]['supplier.lists.type']" /> |
209 | 215 | <?php endif; ?> |
@@ -121,9 +121,12 @@ discard block |
||
121 | 121 | <?= $enc->html( $this->translate( 'admin', 'Types for additional images like icons' ) ); ?> |
122 | 122 | </div> |
123 | 123 | </div> |
124 | - <?php else : ?> |
|
124 | + <?php else { |
|
125 | + : ?> |
|
125 | 126 | <input class="item-type" type="hidden" |
126 | - v-bind:name="'<?= $enc->attr( $this->formparam( array( 'media', 'idx', 'media.type' ) ) ); ?>'.replace( 'idx', idx )" |
|
127 | + v-bind:name="'<?= $enc->attr( $this->formparam( array( 'media', 'idx', 'media.type' ) ) ); |
|
128 | +} |
|
129 | +?>'.replace( 'idx', idx )" |
|
127 | 130 | value="<?= $enc->attr( key( $mediaTypes ) ); ?>" /> |
128 | 131 | <?php endif; ?> |
129 | 132 | |
@@ -201,9 +204,12 @@ discard block |
||
201 | 204 | <?= $enc->html( $this->translate( 'admin', 'Second level type for grouping items' ) ); ?> |
202 | 205 | </div> |
203 | 206 | </div> |
204 | - <?php else : ?> |
|
207 | + <?php else { |
|
208 | + : ?> |
|
205 | 209 | <input class="listitem-type" type="hidden" |
206 | - v-bind:name="'<?= $enc->attr( $this->formparam( array( 'media', 'idx', 'catalog.lists.type' ) ) ); ?>'.replace( 'idx', idx )" |
|
210 | + v-bind:name="'<?= $enc->attr( $this->formparam( array( 'media', 'idx', 'catalog.lists.type' ) ) ); |
|
211 | +} |
|
212 | +?>'.replace( 'idx', idx )" |
|
207 | 213 | value="<?= $enc->attr( key( $listTypes ) ); ?>" |
208 | 214 | v-model="items[idx]['catalog.lists.type']" /> |
209 | 215 | <?php endif; ?> |
@@ -121,9 +121,12 @@ discard block |
||
121 | 121 | <?= $enc->html( $this->translate( 'admin', 'Types for additional images like icons' ) ); ?> |
122 | 122 | </div> |
123 | 123 | </div> |
124 | - <?php else : ?> |
|
124 | + <?php else { |
|
125 | + : ?> |
|
125 | 126 | <input class="item-type" type="hidden" |
126 | - v-bind:name="'<?= $enc->attr( $this->formparam( array( 'media', 'idx', 'media.type' ) ) ); ?>'.replace( 'idx', idx )" |
|
127 | + v-bind:name="'<?= $enc->attr( $this->formparam( array( 'media', 'idx', 'media.type' ) ) ); |
|
128 | +} |
|
129 | +?>'.replace( 'idx', idx )" |
|
127 | 130 | value="<?= $enc->attr( key( $mediaTypes ) ); ?>" /> |
128 | 131 | <?php endif; ?> |
129 | 132 | |
@@ -201,9 +204,12 @@ discard block |
||
201 | 204 | <?= $enc->html( $this->translate( 'admin', 'Second level type for grouping items' ) ); ?> |
202 | 205 | </div> |
203 | 206 | </div> |
204 | - <?php else : ?> |
|
207 | + <?php else { |
|
208 | + : ?> |
|
205 | 209 | <input class="listitem-type" type="hidden" |
206 | - v-bind:name="'<?= $enc->attr( $this->formparam( array( 'media', 'idx', 'attribute.lists.type' ) ) ); ?>'.replace( 'idx', idx )" |
|
210 | + v-bind:name="'<?= $enc->attr( $this->formparam( array( 'media', 'idx', 'attribute.lists.type' ) ) ); |
|
211 | +} |
|
212 | +?>'.replace( 'idx', idx )" |
|
207 | 213 | value="<?= $enc->attr( key( $listTypes ) ); ?>" |
208 | 214 | v-model="items[idx]['attribute.lists.type']" /> |
209 | 215 | <?php endif; ?> |
@@ -121,9 +121,12 @@ discard block |
||
121 | 121 | <?= $enc->html( $this->translate( 'admin', 'Types for additional images like icons' ) ); ?> |
122 | 122 | </div> |
123 | 123 | </div> |
124 | - <?php else : ?> |
|
124 | + <?php else { |
|
125 | + : ?> |
|
125 | 126 | <input class="item-type" type="hidden" |
126 | - v-bind:name="'<?= $enc->attr( $this->formparam( array( 'media', 'idx', 'media.type' ) ) ); ?>'.replace( 'idx', idx )" |
|
127 | + v-bind:name="'<?= $enc->attr( $this->formparam( array( 'media', 'idx', 'media.type' ) ) ); |
|
128 | +} |
|
129 | +?>'.replace( 'idx', idx )" |
|
127 | 130 | value="<?= $enc->attr( key( $mediaTypes ) ); ?>" /> |
128 | 131 | <?php endif; ?> |
129 | 132 | |
@@ -201,9 +204,12 @@ discard block |
||
201 | 204 | <?= $enc->html( $this->translate( 'admin', 'Second level type for grouping items' ) ); ?> |
202 | 205 | </div> |
203 | 206 | </div> |
204 | - <?php else : ?> |
|
207 | + <?php else { |
|
208 | + : ?> |
|
205 | 209 | <input class="listitem-type" type="hidden" |
206 | - v-bind:name="'<?= $enc->attr( $this->formparam( array( 'media', 'idx', 'product.lists.type' ) ) ); ?>'.replace( 'idx', idx )" |
|
210 | + v-bind:name="'<?= $enc->attr( $this->formparam( array( 'media', 'idx', 'product.lists.type' ) ) ); |
|
211 | +} |
|
212 | +?>'.replace( 'idx', idx )" |
|
207 | 213 | value="<?= $enc->attr( key( $listTypes ) ); ?>" |
208 | 214 | v-model="items[idx]['product.lists.type']" /> |
209 | 215 | <?php endif; ?> |
@@ -121,9 +121,12 @@ discard block |
||
121 | 121 | <?= $enc->html( $this->translate( 'admin', 'Types for additional images like icons' ) ); ?> |
122 | 122 | </div> |
123 | 123 | </div> |
124 | - <?php else : ?> |
|
124 | + <?php else { |
|
125 | + : ?> |
|
125 | 126 | <input class="item-type" type="hidden" |
126 | - v-bind:name="'<?= $enc->attr( $this->formparam( array( 'media', 'idx', 'media.type' ) ) ); ?>'.replace( 'idx', idx )" |
|
127 | + v-bind:name="'<?= $enc->attr( $this->formparam( array( 'media', 'idx', 'media.type' ) ) ); |
|
128 | +} |
|
129 | +?>'.replace( 'idx', idx )" |
|
127 | 130 | value="<?= $enc->attr( key( $mediaTypes ) ); ?>" /> |
128 | 131 | <?php endif; ?> |
129 | 132 | |
@@ -201,9 +204,12 @@ discard block |
||
201 | 204 | <?= $enc->html( $this->translate( 'admin', 'Second level type for grouping items' ) ); ?> |
202 | 205 | </div> |
203 | 206 | </div> |
204 | - <?php else : ?> |
|
207 | + <?php else { |
|
208 | + : ?> |
|
205 | 209 | <input class="listitem-type" type="hidden" |
206 | - v-bind:name="'<?= $enc->attr( $this->formparam( array( 'media', 'idx', 'service.lists.type' ) ) ); ?>'.replace( 'idx', idx )" |
|
210 | + v-bind:name="'<?= $enc->attr( $this->formparam( array( 'media', 'idx', 'service.lists.type' ) ) ); |
|
211 | +} |
|
212 | +?>'.replace( 'idx', idx )" |
|
207 | 213 | value="<?= $enc->attr( key( $listTypes ) ); ?>" |
208 | 214 | v-model="items[idx]['service.lists.type']" /> |
209 | 215 | <?php endif; ?> |