@@ -159,7 +159,7 @@ discard block |
||
| 159 | 159 | { |
| 160 | 160 | if(isset($this->components[$componentName])){ |
| 161 | 161 | return $this->components[$componentName]; |
| 162 | - }else{ |
|
| 162 | + } else{ |
|
| 163 | 163 | return null; |
| 164 | 164 | } |
| 165 | 165 | } |
@@ -427,8 +427,7 @@ discard block |
||
| 427 | 427 | if(empty($component->getPackageName())){ |
| 428 | 428 | $noPackageNames[] = $component->getName(); |
| 429 | 429 | } |
| 430 | - } |
|
| 431 | - catch (\Exception $e){ |
|
| 430 | + } catch (\Exception $e){ |
|
| 432 | 431 | |
| 433 | 432 | } |
| 434 | 433 | } |
@@ -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 | ); |
@@ -392,8 +385,7 @@ discard block |
||
| 392 | 385 | $pos = strrpos($setName, '\\'); |
| 393 | 386 | if($pos === false){ |
| 394 | 387 | list (, $appSetName) = explode('_', $setName); |
| 395 | - } |
|
| 396 | - else{ |
|
| 388 | + } else{ |
|
| 397 | 389 | list (, $appSetName) = array( |
| 398 | 390 | substr($setName, 0, $pos), |
| 399 | 391 | substr($setName, $pos + 1) |
@@ -545,8 +537,7 @@ discard block |
||
| 545 | 537 | ->addClass('icon', \Func_Icons::STATUS_DIALOG_ERROR) |
| 546 | 538 | ->addAttribute('data-removefor', $column->getFieldPath())) |
| 547 | 539 | ->setAlignItems(WidgetFlexLayout::FLEX_ALIGN_ITEMS_FLEX_END)); |
| 548 | - } |
|
| 549 | - elseif($displayAdvancedForm){ |
|
| 540 | + } elseif($displayAdvancedForm){ |
|
| 550 | 541 | $formItem->setSizePolicy('col-lg-2 col-md-3 col-sm-6 col-xs-12'); |
| 551 | 542 | $filterBox->addItem($formItem); |
| 552 | 543 | } |
@@ -679,20 +670,17 @@ discard block |
||
| 679 | 670 | |
| 680 | 671 | if(isset($name)){ |
| 681 | 672 | $this->sortParameterName = $name . '[filter][sort]'; |
| 682 | - } |
|
| 683 | - else{ |
|
| 673 | + } else{ |
|
| 684 | 674 | $this->sortParameterName = 'filter[sort]'; |
| 685 | 675 | } |
| 686 | 676 | |
| 687 | 677 | if(isset($filter['sort'])){ |
| 688 | 678 | $this->setSortField($filter['sort']); |
| 689 | - } |
|
| 690 | - elseif(! isset($this->sortField)){ |
|
| 679 | + } elseif(! isset($this->sortField)){ |
|
| 691 | 680 | |
| 692 | 681 | if(method_exists($this, 'getDefaultSortField')){ |
| 693 | 682 | $this->setSortField($this->getDefaultSortField()); |
| 694 | - } |
|
| 695 | - else{ |
|
| 683 | + } else{ |
|
| 696 | 684 | $columns = $this->getVisibleColumns(); |
| 697 | 685 | $sortField = key($columns); |
| 698 | 686 | $this->setSortField($sortField); |
@@ -707,8 +695,7 @@ discard block |
||
| 707 | 695 | $name, |
| 708 | 696 | 'filter' |
| 709 | 697 | ); |
| 710 | - } |
|
| 711 | - else{ |
|
| 698 | + } else{ |
|
| 712 | 699 | $path = array( |
| 713 | 700 | 'filter' |
| 714 | 701 | ); |
@@ -179,8 +179,7 @@ discard block |
||
| 179 | 179 | |
| 180 | 180 | /*@var $customfield AppCustomField */ |
| 181 | 181 | } |
| 182 | - } |
|
| 183 | - catch (ORMBackEndSelectException $e){ |
|
| 182 | + } catch (ORMBackEndSelectException $e){ |
|
| 184 | 183 | // table does not exist, this error is thrown by the install program while creating the sets |
| 185 | 184 | } |
| 186 | 185 | } |
@@ -217,8 +216,7 @@ discard block |
||
| 217 | 216 | if($ormField instanceof ORMFkField){ |
| 218 | 217 | $this->hasOne($customField->fieldname, $ormField->getForeignSetName()) |
| 219 | 218 | ->setDescription($description); |
| 220 | - } |
|
| 221 | - else{ |
|
| 219 | + } else{ |
|
| 222 | 220 | $this->addFields($ormField); |
| 223 | 221 | } |
| 224 | 222 | } |
@@ -281,8 +279,7 @@ discard block |
||
| 281 | 279 | |
| 282 | 280 | if(is_array($source) || ($source instanceof \Iterator)){ |
| 283 | 281 | return $linkSet->selectForSources($source, $targetClass, $linkType); |
| 284 | - } |
|
| 285 | - else{ |
|
| 282 | + } else{ |
|
| 286 | 283 | return $linkSet->selectForSource($source, $targetClass, $linkType); |
| 287 | 284 | } |
| 288 | 285 | } |
@@ -308,8 +305,7 @@ discard block |
||
| 308 | 305 | |
| 309 | 306 | if(is_array($target) || ($target instanceof \Iterator)){ |
| 310 | 307 | return $linkSet->selectForTargets($target, $sourceClass, $linkType); |
| 311 | - } |
|
| 312 | - else{ |
|
| 308 | + } else{ |
|
| 313 | 309 | return $linkSet->selectForTarget($target, $sourceClass, $linkType); |
| 314 | 310 | } |
| 315 | 311 | } |
@@ -344,8 +340,7 @@ discard block |
||
| 344 | 340 | if(isset($linkType)){ |
| 345 | 341 | if(is_array($linkType)){ |
| 346 | 342 | $criteria = $criteria->_AND_($linkSet->type->in($linkType)); |
| 347 | - } |
|
| 348 | - else{ |
|
| 343 | + } else{ |
|
| 349 | 344 | $criteria = $criteria->_AND_($linkSet->type->is($linkType)); |
| 350 | 345 | } |
| 351 | 346 | } |
@@ -388,8 +383,7 @@ discard block |
||
| 388 | 383 | if(isset($linkType)){ |
| 389 | 384 | if(is_array($linkType)){ |
| 390 | 385 | $criteria = $criteria->_AND_($linkSet->type->in($linkType)); |
| 391 | - } |
|
| 392 | - else{ |
|
| 386 | + } else{ |
|
| 393 | 387 | $criteria = $criteria->_AND_($linkSet->type->is($linkType)); |
| 394 | 388 | } |
| 395 | 389 | } |
@@ -442,8 +436,7 @@ discard block |
||
| 442 | 436 | if(isset($linkType)){ |
| 443 | 437 | if(is_array($linkType)){ |
| 444 | 438 | $criteria = $criteria->_AND_($linkSet->type->in($linkType)); |
| 445 | - } |
|
| 446 | - else{ |
|
| 439 | + } else{ |
|
| 447 | 440 | $criteria = $criteria->_AND_($linkSet->type->is($linkType)); |
| 448 | 441 | } |
| 449 | 442 | } |
@@ -496,8 +489,7 @@ discard block |
||
| 496 | 489 | if(isset($linkType)){ |
| 497 | 490 | if(is_array($linkType)){ |
| 498 | 491 | $criteria = $criteria->_AND_($linkSet->type->in($linkType)); |
| 499 | - } |
|
| 500 | - else{ |
|
| 492 | + } else{ |
|
| 501 | 493 | $criteria = $criteria->_AND_($linkSet->type->is($linkType)); |
| 502 | 494 | } |
| 503 | 495 | } |
@@ -614,8 +606,7 @@ discard block |
||
| 614 | 606 | |
| 615 | 607 | if(is_array($tagLabels)){ |
| 616 | 608 | $criteria = $criteria->_AND_($linkSet->targetId->label->in($tagLabels)); |
| 617 | - } |
|
| 618 | - else{ |
|
| 609 | + } else{ |
|
| 619 | 610 | $criteria = $criteria->_AND_($linkSet->targetId->label->is($tagLabels)); |
| 620 | 611 | } |
| 621 | 612 | if(isset($linkType)){ |