@@ -280,7 +280,7 @@ discard block |
||
280 | 280 | foreach($input as $k=>$v){ |
281 | 281 | $return[utf8_decode($k)] = app_utf8Decode($v); |
282 | 282 | } |
283 | - }else{ |
|
283 | + } else{ |
|
284 | 284 | return utf8_decode($input); |
285 | 285 | } |
286 | 286 | return $return; |
@@ -292,7 +292,7 @@ discard block |
||
292 | 292 | foreach($input as $k=>$v){ |
293 | 293 | $return[app_utf8Encode($k)] = app_utf8Encode($v); |
294 | 294 | } |
295 | - }else{ |
|
295 | + } else{ |
|
296 | 296 | return utf8_encode($input); |
297 | 297 | } |
298 | 298 | return $return; |
@@ -180,8 +180,7 @@ discard block |
||
180 | 180 | |
181 | 181 | /*@var $customfield AppCustomField */ |
182 | 182 | } |
183 | - } |
|
184 | - catch (ORMBackEndSelectException $e){ |
|
183 | + } catch (ORMBackEndSelectException $e){ |
|
185 | 184 | // table does not exist, this error is thrown by the install program while creating the sets |
186 | 185 | } |
187 | 186 | } |
@@ -218,8 +217,7 @@ discard block |
||
218 | 217 | if($ormField instanceof ORMFkField){ |
219 | 218 | $this->hasOne($customField->fieldname, $ormField->getForeignSetName()) |
220 | 219 | ->setDescription($description); |
221 | - } |
|
222 | - else{ |
|
220 | + } else{ |
|
223 | 221 | $this->addFields($ormField); |
224 | 222 | } |
225 | 223 | } |
@@ -282,8 +280,7 @@ discard block |
||
282 | 280 | |
283 | 281 | if(is_array($source) || ($source instanceof \Iterator)){ |
284 | 282 | return $linkSet->selectForSources($source, $targetClass, $linkType); |
285 | - } |
|
286 | - else{ |
|
283 | + } else{ |
|
287 | 284 | return $linkSet->selectForSource($source, $targetClass, $linkType); |
288 | 285 | } |
289 | 286 | } |
@@ -309,8 +306,7 @@ discard block |
||
309 | 306 | |
310 | 307 | if(is_array($target) || ($target instanceof \Iterator)){ |
311 | 308 | return $linkSet->selectForTargets($target, $sourceClass, $linkType); |
312 | - } |
|
313 | - else{ |
|
309 | + } else{ |
|
314 | 310 | return $linkSet->selectForTarget($target, $sourceClass, $linkType); |
315 | 311 | } |
316 | 312 | } |
@@ -345,8 +341,7 @@ discard block |
||
345 | 341 | if(isset($linkType)){ |
346 | 342 | if(is_array($linkType)){ |
347 | 343 | $criteria = $criteria->_AND_($linkSet->type->in($linkType)); |
348 | - } |
|
349 | - else{ |
|
344 | + } else{ |
|
350 | 345 | $criteria = $criteria->_AND_($linkSet->type->is($linkType)); |
351 | 346 | } |
352 | 347 | } |
@@ -389,8 +384,7 @@ discard block |
||
389 | 384 | if(isset($linkType)){ |
390 | 385 | if(is_array($linkType)){ |
391 | 386 | $criteria = $criteria->_AND_($linkSet->type->in($linkType)); |
392 | - } |
|
393 | - else{ |
|
387 | + } else{ |
|
394 | 388 | $criteria = $criteria->_AND_($linkSet->type->is($linkType)); |
395 | 389 | } |
396 | 390 | } |
@@ -443,8 +437,7 @@ discard block |
||
443 | 437 | if(isset($linkType)){ |
444 | 438 | if(is_array($linkType)){ |
445 | 439 | $criteria = $criteria->_AND_($linkSet->type->in($linkType)); |
446 | - } |
|
447 | - else{ |
|
440 | + } else{ |
|
448 | 441 | $criteria = $criteria->_AND_($linkSet->type->is($linkType)); |
449 | 442 | } |
450 | 443 | } |
@@ -497,8 +490,7 @@ discard block |
||
497 | 490 | if(isset($linkType)){ |
498 | 491 | if(is_array($linkType)){ |
499 | 492 | $criteria = $criteria->_AND_($linkSet->type->in($linkType)); |
500 | - } |
|
501 | - else{ |
|
493 | + } else{ |
|
502 | 494 | $criteria = $criteria->_AND_($linkSet->type->is($linkType)); |
503 | 495 | } |
504 | 496 | } |
@@ -615,8 +607,7 @@ discard block |
||
615 | 607 | |
616 | 608 | if(is_array($tagLabels)){ |
617 | 609 | $criteria = $criteria->_AND_($linkSet->targetId->label->in($tagLabels)); |
618 | - } |
|
619 | - else{ |
|
610 | + } else{ |
|
620 | 611 | $criteria = $criteria->_AND_($linkSet->targetId->label->is($tagLabels)); |
621 | 612 | } |
622 | 613 | if(isset($linkType)){ |
@@ -652,7 +643,7 @@ discard block |
||
652 | 643 | public function getDisplayNameField(){ |
653 | 644 | if($this->fieldExist("name")){ |
654 | 645 | return $this->name; |
655 | - }else{ |
|
646 | + } else{ |
|
656 | 647 | return $this->id; |
657 | 648 | } |
658 | 649 | } |
@@ -352,7 +352,7 @@ |
||
352 | 352 | public function getDisplayNameField(){ |
353 | 353 | if($this->fieldExist("name")){ |
354 | 354 | return $this->name; |
355 | - }else{ |
|
355 | + } else{ |
|
356 | 356 | return $this->uuid; |
357 | 357 | } |
358 | 358 | } |
@@ -51,8 +51,7 @@ |
||
51 | 51 | return null; |
52 | 52 | } |
53 | 53 | return \bab_functionality::get($composerjson['appFunctionality']); |
54 | - } |
|
55 | - catch (\Exception $e){ |
|
54 | + } catch (\Exception $e){ |
|
56 | 55 | return null; |
57 | 56 | } |
58 | 57 | } |
@@ -316,16 +316,16 @@ |
||
316 | 316 | $pkName = $set->getPrimaryKey(); |
317 | 317 | if($set->fieldExist("name")){ |
318 | 318 | $displayField = $set->name->getName(); |
319 | - }else if(method_exists($set,"getDisplayNameField")){ |
|
319 | + } else if(method_exists($set,"getDisplayNameField")){ |
|
320 | 320 | $displayField = $set->getDisplayNameField()->getName(); |
321 | - }else{ |
|
321 | + } else{ |
|
322 | 322 | $displayField = $pkName; |
323 | 323 | } |
324 | 324 | $records->orderAsc($set->$displayField); |
325 | 325 | if($records->count() > 50){ |
326 | 326 | $widget = bab_Widgets()->select2(); |
327 | 327 | $widget->setDataSource($set->getController()->search()); |
328 | - }else{ |
|
328 | + } else{ |
|
329 | 329 | $widget = $W->Select(); |
330 | 330 | $widget->addOption('', ''); |
331 | 331 | foreach ($records as $record) { |
@@ -140,16 +140,14 @@ discard block |
||
140 | 140 | $isSearchable = false; |
141 | 141 | $isSortable = false; |
142 | 142 | $columnItem = $W->FlexItems($this->toggleCheckAllBox); |
143 | - } |
|
144 | - elseif(isset($this->sortParameterName) && self::getRecordSetField($set, $columnPath) && $isSortable){ |
|
143 | + } elseif(isset($this->sortParameterName) && self::getRecordSetField($set, $columnPath) && $isSortable){ |
|
145 | 144 | if(! isset($this->sortBaseUrl)){ |
146 | 145 | $this->sortBaseUrl = \bab_url::request_gp(); |
147 | 146 | } |
148 | 147 | |
149 | 148 | if($this->sortField === $columnPath && $this->sortAscending){ |
150 | 149 | $direction = ':down'; |
151 | - } |
|
152 | - else{ |
|
150 | + } else{ |
|
153 | 151 | $direction = ':up'; |
154 | 152 | } |
155 | 153 | |
@@ -166,8 +164,7 @@ discard block |
||
166 | 164 | $columnItem->setAjaxAction($this->sortAjaxAction->setParameter('sort', $columnPath . $direction), ''); |
167 | 165 | } |
168 | 166 | $columnItem = $W->FlexItems($columnItem); |
169 | - } |
|
170 | - else{ |
|
167 | + } else{ |
|
171 | 168 | $columnItem = $W->FlexItems($W->Label($columnLabel), $W->Label('')); |
172 | 169 | } |
173 | 170 | |
@@ -299,20 +296,17 @@ discard block |
||
299 | 296 | |
300 | 297 | if(isset($name)){ |
301 | 298 | $this->sortParameterName = $name . '[filter][sort]'; |
302 | - } |
|
303 | - else{ |
|
299 | + } else{ |
|
304 | 300 | $this->sortParameterName = 'filter[sort]'; |
305 | 301 | } |
306 | 302 | |
307 | 303 | if(isset($filter['sort'])){ |
308 | 304 | $this->setSortField($filter['sort']); |
309 | - } |
|
310 | - elseif(! isset($this->sortField)){ |
|
305 | + } elseif(! isset($this->sortField)){ |
|
311 | 306 | |
312 | 307 | if(method_exists($this, 'getDefaultSortField')){ |
313 | 308 | $this->setSortField($this->getDefaultSortField()); |
314 | - } |
|
315 | - else{ |
|
309 | + } else{ |
|
316 | 310 | $columns = $this->getVisibleColumns(); |
317 | 311 | $sortField = key($columns); |
318 | 312 | $this->setSortField($sortField); |
@@ -327,8 +321,7 @@ discard block |
||
327 | 321 | $name, |
328 | 322 | 'filter' |
329 | 323 | ); |
330 | - } |
|
331 | - else{ |
|
324 | + } else{ |
|
332 | 325 | $path = array( |
333 | 326 | 'filter' |
334 | 327 | ); |
@@ -389,8 +382,7 @@ discard block |
||
389 | 382 | $pos = strrpos($setName, '\\'); |
390 | 383 | if($pos === false){ |
391 | 384 | list (, $appSetName) = explode('_', $setName); |
392 | - } |
|
393 | - else{ |
|
385 | + } else{ |
|
394 | 386 | list (, $appSetName) = array( |
395 | 387 | substr($setName, 0, $pos), |
396 | 388 | substr($setName, $pos + 1) |
@@ -409,7 +401,7 @@ discard block |
||
409 | 401 | if($values->count()>15){ |
410 | 402 | $widget = bab_Widgets()->select2(); |
411 | 403 | $widget->setDataSource($set->getController()->search()); |
412 | - }else{ |
|
404 | + } else{ |
|
413 | 405 | $widget = $W->Select(); |
414 | 406 | $widget->addOption('', ''); |
415 | 407 | foreach ($values as $record){ |
@@ -549,8 +541,7 @@ discard block |
||
549 | 541 | ->addClass('icon', \Func_Icons::STATUS_DIALOG_ERROR) |
550 | 542 | ->addAttribute('data-removefor', $column->getFieldPath())) |
551 | 543 | ->setAlignItems(WidgetFlexLayout::FLEX_ALIGN_ITEMS_FLEX_END)); |
552 | - } |
|
553 | - elseif($displayAdvancedForm){ |
|
544 | + } elseif($displayAdvancedForm){ |
|
554 | 545 | $formItem->setSizePolicy('col-lg-2 col-md-3 col-sm-6 col-xs-12'); |
555 | 546 | $filterBox->addItem($formItem); |
556 | 547 | } |
@@ -683,20 +674,17 @@ discard block |
||
683 | 674 | |
684 | 675 | if(isset($name)){ |
685 | 676 | $this->sortParameterName = $name . '[filter][sort]'; |
686 | - } |
|
687 | - else{ |
|
677 | + } else{ |
|
688 | 678 | $this->sortParameterName = 'filter[sort]'; |
689 | 679 | } |
690 | 680 | |
691 | 681 | if(isset($filter['sort'])){ |
692 | 682 | $this->setSortField($filter['sort']); |
693 | - } |
|
694 | - elseif(! isset($this->sortField)){ |
|
683 | + } elseif(! isset($this->sortField)){ |
|
695 | 684 | |
696 | 685 | if(method_exists($this, 'getDefaultSortField')){ |
697 | 686 | $this->setSortField($this->getDefaultSortField()); |
698 | - } |
|
699 | - else{ |
|
687 | + } else{ |
|
700 | 688 | $columns = $this->getVisibleColumns(); |
701 | 689 | $sortField = key($columns); |
702 | 690 | $this->setSortField($sortField); |
@@ -711,8 +699,7 @@ discard block |
||
711 | 699 | $name, |
712 | 700 | 'filter' |
713 | 701 | ); |
714 | - } |
|
715 | - else{ |
|
702 | + } else{ |
|
716 | 703 | $path = array( |
717 | 704 | 'filter' |
718 | 705 | ); |