@@ -113,11 +113,11 @@ discard block |
||
113 | 113 | |
114 | 114 | return str_replace( |
115 | 115 | array('#abort', |
116 | - '__file-uri__', |
|
117 | - '__file-name__', |
|
118 | - '__file-size__', |
|
119 | - 'fu-working', |
|
120 | - 'fa-file-o' |
|
116 | + '__file-uri__', |
|
117 | + '__file-name__', |
|
118 | + '__file-size__', |
|
119 | + 'fu-working', |
|
120 | + 'fa-file-o' |
|
121 | 121 | ), |
122 | 122 | array("$uri?do=delete", $uri, $name, $size, '', $icon), |
123 | 123 | $template |
@@ -141,7 +141,7 @@ discard block |
||
141 | 141 | '<div class="fu-nonempty-notice"' . ('' == trim($preview) ? ' style="display:none;"' : '') . '>' |
142 | 142 | . $this->getNonEmptyNotice() . '</div>'; |
143 | 143 | $emptynotice = '<div class="fu-empty-notice"' |
144 | - . ('' == trim($preview) ? '' : ' style="display: none;"') . '> |
|
144 | + . ('' == trim($preview) ? '' : ' style="display: none;"') . '> |
|
145 | 145 | ' . $this->getEmptyNotice() . ' |
146 | 146 | </div>'; |
147 | 147 | |
@@ -230,99 +230,99 @@ discard block |
||
230 | 230 | } |
231 | 231 | |
232 | 232 | /** |
233 | - * @param string $emptyNotice |
|
234 | - * @return FormFileUpload |
|
235 | - * @since 0.27 |
|
236 | - */ |
|
237 | - public function setEmptyNotice($emptyNotice) |
|
238 | - { |
|
239 | - $this->emptyNotice = $emptyNotice; |
|
233 | + * @param string $emptyNotice |
|
234 | + * @return FormFileUpload |
|
235 | + * @since 0.27 |
|
236 | + */ |
|
237 | + public function setEmptyNotice($emptyNotice) |
|
238 | + { |
|
239 | + $this->emptyNotice = $emptyNotice; |
|
240 | 240 | |
241 | - return $this; |
|
242 | - } |
|
241 | + return $this; |
|
242 | + } |
|
243 | 243 | |
244 | 244 | /** |
245 | - * @return string |
|
246 | - * @since 0.27 |
|
247 | - */ |
|
248 | - protected function getEmptyNotice() |
|
249 | - { |
|
250 | - if (!isset($this->emptyNotice)) |
|
251 | - { |
|
252 | - $this->emptyNotice = ' |
|
245 | + * @return string |
|
246 | + * @since 0.27 |
|
247 | + */ |
|
248 | + protected function getEmptyNotice() |
|
249 | + { |
|
250 | + if (!isset($this->emptyNotice)) |
|
251 | + { |
|
252 | + $this->emptyNotice = ' |
|
253 | 253 | <div class="pull-left"> |
254 | 254 | <span class="yk-icon fa-files-o fa-5x"></span> |
255 | 255 | </div>' . $this->getDefaultNotice(); |
256 | - } |
|
256 | + } |
|
257 | 257 | |
258 | - return $this->emptyNotice; |
|
259 | - } |
|
258 | + return $this->emptyNotice; |
|
259 | + } |
|
260 | 260 | |
261 | 261 | /** |
262 | - * @param string $nonEmptyNotice |
|
263 | - * @return FormFileUpload |
|
264 | - * @since 0.27 |
|
265 | - */ |
|
266 | - public function setNonEmptyNotice($nonEmptyNotice) |
|
267 | - { |
|
268 | - $this->nonEmptyNotice = $nonEmptyNotice; |
|
262 | + * @param string $nonEmptyNotice |
|
263 | + * @return FormFileUpload |
|
264 | + * @since 0.27 |
|
265 | + */ |
|
266 | + public function setNonEmptyNotice($nonEmptyNotice) |
|
267 | + { |
|
268 | + $this->nonEmptyNotice = $nonEmptyNotice; |
|
269 | 269 | |
270 | - return $this; |
|
271 | - } |
|
270 | + return $this; |
|
271 | + } |
|
272 | 272 | |
273 | 273 | /** |
274 | - * @return string |
|
275 | - * @since 0.27 |
|
276 | - */ |
|
277 | - protected function getNonEmptyNotice() |
|
278 | - { |
|
279 | - if (!isset($this->nonEmptyNotice)) |
|
280 | - { |
|
281 | - $this->nonEmptyNotice = $this->getDefaultNotice(); |
|
282 | - } |
|
274 | + * @return string |
|
275 | + * @since 0.27 |
|
276 | + */ |
|
277 | + protected function getNonEmptyNotice() |
|
278 | + { |
|
279 | + if (!isset($this->nonEmptyNotice)) |
|
280 | + { |
|
281 | + $this->nonEmptyNotice = $this->getDefaultNotice(); |
|
282 | + } |
|
283 | 283 | |
284 | - return $this->nonEmptyNotice; |
|
285 | - } |
|
284 | + return $this->nonEmptyNotice; |
|
285 | + } |
|
286 | 286 | |
287 | 287 | /** |
288 | - * @return string |
|
289 | - * @since 0.27 |
|
290 | - */ |
|
291 | - protected function getDefaultNotice() |
|
292 | - { |
|
293 | - return '<small>' . $this->getTranslator()->translate('Click here to add files or use drag and drop.') . '</small>'; |
|
294 | - } |
|
288 | + * @return string |
|
289 | + * @since 0.27 |
|
290 | + */ |
|
291 | + protected function getDefaultNotice() |
|
292 | + { |
|
293 | + return '<small>' . $this->getTranslator()->translate('Click here to add files or use drag and drop.') . '</small>'; |
|
294 | + } |
|
295 | 295 | |
296 | 296 | /** |
297 | - * @param boolean $allowRemove |
|
298 | - * @return FormFileUpload |
|
299 | - * @since 0.27 |
|
300 | - */ |
|
301 | - public function setAllowRemove($allowRemove) |
|
302 | - { |
|
303 | - $this->allowRemove = (bool)$allowRemove; |
|
297 | + * @param boolean $allowRemove |
|
298 | + * @return FormFileUpload |
|
299 | + * @since 0.27 |
|
300 | + */ |
|
301 | + public function setAllowRemove($allowRemove) |
|
302 | + { |
|
303 | + $this->allowRemove = (bool)$allowRemove; |
|
304 | 304 | |
305 | - return $this; |
|
306 | - } |
|
305 | + return $this; |
|
306 | + } |
|
307 | 307 | |
308 | 308 | /** |
309 | - * @param boolean $allowClickableDropZone |
|
310 | - * @return FormFileUpload |
|
311 | - * @since 0.27 |
|
312 | - */ |
|
313 | - public function setAllowClickableDropZone($allowClickableDropZone) |
|
314 | - { |
|
315 | - $this->allowClickableDropZone = (bool)$allowClickableDropZone; |
|
309 | + * @param boolean $allowClickableDropZone |
|
310 | + * @return FormFileUpload |
|
311 | + * @since 0.27 |
|
312 | + */ |
|
313 | + public function setAllowClickableDropZone($allowClickableDropZone) |
|
314 | + { |
|
315 | + $this->allowClickableDropZone = (bool)$allowClickableDropZone; |
|
316 | 316 | |
317 | - return $this; |
|
318 | - } |
|
317 | + return $this; |
|
318 | + } |
|
319 | 319 | |
320 | - /** |
|
321 | - * @since 0.27 |
|
322 | - */ |
|
323 | - protected function setupAssets() |
|
324 | - { |
|
325 | - /* @var $renderer \Zend\View\Renderer\PhpRenderer */ |
|
320 | + /** |
|
321 | + * @since 0.27 |
|
322 | + */ |
|
323 | + protected function setupAssets() |
|
324 | + { |
|
325 | + /* @var $renderer \Zend\View\Renderer\PhpRenderer */ |
|
326 | 326 | /* @var $basepath \Zend\View\Helper\BasePath */ |
327 | 327 | $renderer = $this->getView(); |
328 | 328 | $basepath = $renderer->plugin('basepath'); |
@@ -331,5 +331,5 @@ discard block |
||
331 | 331 | ->appendFile($basepath('assets/blueimp-file-upload/js/jquery.iframe-transport.js')) |
332 | 332 | ->appendFile($basepath('assets/blueimp-file-upload/js/jquery.fileupload.js')) |
333 | 333 | ->appendFile($basepath($this->scriptFile)); |
334 | - } |
|
334 | + } |
|
335 | 335 | } |
@@ -28,8 +28,8 @@ |
||
28 | 28 | * |
29 | 29 | * @var array |
30 | 30 | */ |
31 | - protected $fields=[ |
|
32 | - 'q' => [ |
|
31 | + protected $fields=[ |
|
32 | + 'q' => [ |
|
33 | 33 | 'enabled' => true |
34 | 34 | ], |
35 | 35 | 'l' => [ |
@@ -140,12 +140,12 @@ |
||
140 | 140 | public function findLatest($sourceId, $isDraft = false) |
141 | 141 | { |
142 | 142 | return $this->createQueryBuilder() |
143 | - ->field('snapshotMeta.entity.$id')->equals(new \MongoId($sourceId)) |
|
144 | - ->field('snapshotMeta.isDraft')->equals($isDraft) |
|
145 | - ->sort('snapshotMeta.dateCreated.date', 'desc') |
|
146 | - ->limit(1) |
|
147 | - ->getQuery() |
|
148 | - ->getSingleResult(); |
|
143 | + ->field('snapshotMeta.entity.$id')->equals(new \MongoId($sourceId)) |
|
144 | + ->field('snapshotMeta.isDraft')->equals($isDraft) |
|
145 | + ->sort('snapshotMeta.dateCreated.date', 'desc') |
|
146 | + ->limit(1) |
|
147 | + ->getQuery() |
|
148 | + ->getSingleResult(); |
|
149 | 149 | |
150 | 150 | } |
151 | 151 |
@@ -58,7 +58,7 @@ |
||
58 | 58 | if (!is_callable($callback)) { |
59 | 59 | throw new \BadMethodCallException(sprintf( |
60 | 60 | 'Proxy error: Method "%s" does not exist in proxied "%s"', |
61 | - $method, get_class($entity) |
|
61 | + $method, get_class($entity) |
|
62 | 62 | )); |
63 | 63 | } |
64 | 64 |
@@ -69,7 +69,7 @@ |
||
69 | 69 | ? [ |
70 | 70 | 'type' => $coords->getType(), |
71 | 71 | 'coordinates' => $coords->getCoordinates(), |
72 | - ] |
|
72 | + ] |
|
73 | 73 | : null |
74 | 74 | |
75 | 75 | ]; |
@@ -108,8 +108,8 @@ |
||
108 | 108 | $paginator = $paginators->get($paginatorName,$params); |
109 | 109 | } |
110 | 110 | $paginator->setCurrentPageNumber(isset($params['page']) ? $params['page'] : 1) |
111 | - ->setItemCountPerPage(isset($params['count']) ? $params['count'] : 10) |
|
112 | - ->setPageRange(isset($params['range']) ? $params['range'] : 5); |
|
111 | + ->setItemCountPerPage(isset($params['count']) ? $params['count'] : 10) |
|
112 | + ->setPageRange(isset($params['range']) ? $params['range'] : 5); |
|
113 | 113 | |
114 | 114 | return $paginator; |
115 | 115 | } |
@@ -24,8 +24,8 @@ |
||
24 | 24 | * @author Mathias Gelhausen <[email protected]> |
25 | 25 | */ |
26 | 26 | class Form extends ZendForm implements DescriptionAwareFormInterface, |
27 | - DisableElementsCapableInterface, |
|
28 | - FormParentInterface |
|
27 | + DisableElementsCapableInterface, |
|
28 | + FormParentInterface |
|
29 | 29 | { |
30 | 30 | |
31 | 31 | use EventManagerAwareTrait, HydratorStrategyAwareTrait; |
@@ -63,16 +63,16 @@ |
||
63 | 63 | |
64 | 64 | foreach ($result as $key => $val) { |
65 | 65 | $row=[ |
66 | - 'postalCode' => (property_exists($val->properties, 'postcode') ? $val->properties->postcode:''), |
|
67 | - 'city' =>(property_exists($val->properties, 'city') ? $val->properties->city:''), |
|
68 | - 'street' => (property_exists($val->properties, 'street') ? $val->properties->street : ''), |
|
69 | - 'region' => (property_exists($val->properties, 'state') ? $val->properties->state : ''), |
|
70 | - 'country' => (property_exists($val->properties, 'country') ? $val->properties->country : ''), |
|
66 | + 'postalCode' => (property_exists($val->properties, 'postcode') ? $val->properties->postcode:''), |
|
67 | + 'city' =>(property_exists($val->properties, 'city') ? $val->properties->city:''), |
|
68 | + 'street' => (property_exists($val->properties, 'street') ? $val->properties->street : ''), |
|
69 | + 'region' => (property_exists($val->properties, 'state') ? $val->properties->state : ''), |
|
70 | + 'country' => (property_exists($val->properties, 'country') ? $val->properties->country : ''), |
|
71 | 71 | |
72 | - 'osm_key' => (property_exists($val->properties, 'osm_key') ? $val->properties->osm_key : ''), |
|
73 | - 'osm_value' => (property_exists($val->properties, 'osm_value') ? $val->properties->osm_value : ''), |
|
74 | - //'id' => (property_exists($val->properties, 'osm_id') ? $val->properties->osm_id : uniqid()), |
|
75 | - //'data' => json_encode($val), |
|
72 | + 'osm_key' => (property_exists($val->properties, 'osm_key') ? $val->properties->osm_key : ''), |
|
73 | + 'osm_value' => (property_exists($val->properties, 'osm_value') ? $val->properties->osm_value : ''), |
|
74 | + //'id' => (property_exists($val->properties, 'osm_id') ? $val->properties->osm_id : uniqid()), |
|
75 | + //'data' => json_encode($val), |
|
76 | 76 | ]; |
77 | 77 | if ($val->geometry) { |
78 | 78 | $row['coordinates'] = [ |
@@ -148,12 +148,12 @@ discard block |
||
148 | 148 | $jobEntity = $this->initializeJob()->get($this->params(), true); |
149 | 149 | |
150 | 150 | $model = new ViewModel([ |
151 | - 'portals' => $jobEntity->getPortals(), |
|
152 | - 'channels' => $channels, |
|
153 | - 'defaultCurrencyCode' => $options->defaultCurrencyCode, |
|
154 | - 'defaultTaxRate' => $options->defaultTaxRate, |
|
155 | - 'jobId' => $jobEntity->getId() |
|
156 | - ]); |
|
151 | + 'portals' => $jobEntity->getPortals(), |
|
152 | + 'channels' => $channels, |
|
153 | + 'defaultCurrencyCode' => $options->defaultCurrencyCode, |
|
154 | + 'defaultTaxRate' => $options->defaultTaxRate, |
|
155 | + 'jobId' => $jobEntity->getId() |
|
156 | + ]); |
|
157 | 157 | $model->setTemplate('jobs/partials/channel-list')->setTerminal(true); |
158 | 158 | return $model; |
159 | 159 | } |
@@ -513,7 +513,7 @@ discard block |
||
513 | 513 | 'lang/jobs/view', |
514 | 514 | array(), |
515 | 515 | array('query' => $query |
516 | - ) |
|
516 | + ) |
|
517 | 517 | ); |
518 | 518 | |
519 | 519 | $approvalLink = $this->url()->fromRoute( |
@@ -529,10 +529,10 @@ discard block |
||
529 | 529 | ); |
530 | 530 | |
531 | 531 | return array('job' => $jobEntity, |
532 | - 'diffSnapshot' => $diff, |
|
533 | - 'viewLink' => $viewLink, |
|
534 | - 'approvalLink' => $approvalLink, |
|
535 | - 'declineLink' => $declineLink); |
|
532 | + 'diffSnapshot' => $diff, |
|
533 | + 'viewLink' => $viewLink, |
|
534 | + 'approvalLink' => $approvalLink, |
|
535 | + 'declineLink' => $declineLink); |
|
536 | 536 | } |
537 | 537 | |
538 | 538 | /** |