@@ -89,12 +89,10 @@ |
||
89 | 89 | foreach( $data as $item ) { |
90 | 90 | $response[] = $build( $item, $childItems, $listItems ); |
91 | 91 | } |
92 | -} |
|
93 | -elseif( $data !== null ) |
|
92 | +} elseif( $data !== null ) |
|
94 | 93 | { |
95 | 94 | $response = $build( $data, $childItems, $listItems ); |
96 | -} |
|
97 | -else |
|
95 | +} else |
|
98 | 96 | { |
99 | 97 | $response = null; |
100 | 98 | } |
@@ -79,12 +79,10 @@ |
||
79 | 79 | foreach( $data as $item ) { |
80 | 80 | $response[] = $build( $item, $childItems ); |
81 | 81 | } |
82 | -} |
|
83 | -elseif( $data !== null ) |
|
82 | +} elseif( $data !== null ) |
|
84 | 83 | { |
85 | 84 | $response = $build( $data, $childItems ); |
86 | -} |
|
87 | -else |
|
85 | +} else |
|
88 | 86 | { |
89 | 87 | $response = null; |
90 | 88 | } |
@@ -85,12 +85,10 @@ |
||
85 | 85 | foreach( $data as $item ) { |
86 | 86 | $response[] = $build( $item, $listItems ); |
87 | 87 | } |
88 | -} |
|
89 | -elseif( $data !== null ) |
|
88 | +} elseif( $data !== null ) |
|
90 | 89 | { |
91 | 90 | $response = $build( $data, $listItems ); |
92 | -} |
|
93 | -else |
|
91 | +} else |
|
94 | 92 | { |
95 | 93 | $response = null; |
96 | 94 | } |
@@ -66,12 +66,10 @@ |
||
66 | 66 | foreach( $data as $item ) { |
67 | 67 | $response[] = $build( $item ); |
68 | 68 | } |
69 | -} |
|
70 | -elseif( $data !== null ) |
|
69 | +} elseif( $data !== null ) |
|
71 | 70 | { |
72 | 71 | $response = $build( $data ); |
73 | -} |
|
74 | -else |
|
72 | +} else |
|
75 | 73 | { |
76 | 74 | $response = null; |
77 | 75 | } |
@@ -79,12 +79,10 @@ |
||
79 | 79 | foreach( $data as $item ) { |
80 | 80 | $response[] = $build( $item, $childItems ); |
81 | 81 | } |
82 | -} |
|
83 | -elseif( $data !== null ) |
|
82 | +} elseif( $data !== null ) |
|
84 | 83 | { |
85 | 84 | $response = $build( $data, $childItems ); |
86 | -} |
|
87 | -else |
|
85 | +} else |
|
88 | 86 | { |
89 | 87 | $response = null; |
90 | 88 | } |
@@ -99,8 +99,7 @@ |
||
99 | 99 | $decorators = $config->get( 'admin/jsonadm/' . $dpath . 'decorators/local', [] ); |
100 | 100 | $client = self::addDecorators( $client, $decorators, $classprefix, $context, $path ); |
101 | 101 | } |
102 | - } |
|
103 | - else |
|
102 | + } else |
|
104 | 103 | { |
105 | 104 | $classprefix = '\\Aimeos\\Admin\\JsonAdm\\Common\\Decorator\\'; |
106 | 105 | $client = self::addDecorators( $client, $decorators, $classprefix, $context, $path ); |
@@ -59,9 +59,12 @@ |
||
59 | 59 | |
60 | 60 | , "errors": <?= $this->partial( $this->config( $this->get( 'partial-errors', 'admin/jsonadm/partials/template-errors' ), 'partials/errors-standard' ), array( 'errors' => $this->errors ) ); ?> |
61 | 61 | |
62 | - <?php else : ?> |
|
62 | + <?php else { |
|
63 | + : ?> |
|
63 | 64 | |
64 | - , "data": <?= json_encode( $build( $configItems, $this->param( 'id' ) ), $options ); ?> |
|
65 | + , "data": <?= json_encode( $build( $configItems, $this->param( 'id' ) ), $options ); |
|
66 | +} |
|
67 | +?> |
|
65 | 68 | |
66 | 69 | <?php endif; ?> |
67 | 70 | } |
@@ -180,8 +180,7 @@ |
||
180 | 180 | } |
181 | 181 | |
182 | 182 | $item = $manager->saveItem( $item ); |
183 | - } |
|
184 | - else |
|
183 | + } else |
|
185 | 184 | { |
186 | 185 | $item = $manager->createItem(); |
187 | 186 |
@@ -182,8 +182,7 @@ discard block |
||
182 | 182 | $view->data = $manager->searchItems( $search, [], $total ); |
183 | 183 | $view->listItems = $this->getListItems( $view->data, $include ); |
184 | 184 | $view->childItems = []; |
185 | - } |
|
186 | - else |
|
185 | + } else |
|
187 | 186 | { |
188 | 187 | $level = \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE; |
189 | 188 | if( in_array( 'catalog', $include ) ) { |
@@ -249,8 +248,7 @@ discard block |
||
249 | 248 | if( isset( $entry->parentid ) && $targetId !== null ) { |
250 | 249 | $manager->moveItem( $item->getId(), $entry->parentid, $targetId, $refId ); |
251 | 250 | } |
252 | - } |
|
253 | - else |
|
251 | + } else |
|
254 | 252 | { |
255 | 253 | $item = $manager->createItem(); |
256 | 254 |