@@ -21,14 +21,14 @@ |
||
| 21 | 21 | |
| 22 | 22 | public function install() |
| 23 | 23 | { |
| 24 | - Model\HomePage::migrate(); |
|
| 24 | + Model\HomePage::migrate(); |
|
| 25 | 25 | |
| 26 | 26 | // setup default home pages |
| 27 | 27 | Model\HomePage::create()->import([ |
| 28 | - [ |
|
| 29 | - 'path' => 'view/dashboard', |
|
| 30 | - 'role' => 'Super Admin' |
|
| 31 | - ], |
|
| 28 | + [ |
|
| 29 | + 'path' => 'view/dashboard', |
|
| 30 | + 'role' => 'Super Admin' |
|
| 31 | + ], |
|
| 32 | 32 | [ |
| 33 | 33 | 'path' => 'view/dashboard', |
| 34 | 34 | 'role' => 'Employee' |
@@ -23,7 +23,7 @@ |
||
| 23 | 23 | |
| 24 | 24 | $grid = $this->add([ |
| 25 | 25 | Crud::class, |
| 26 | - 'menu' => ActionBar::instance(), |
|
| 26 | + 'menu' => ActionBar::instance(), |
|
| 27 | 27 | // 'model' => HomePage::create(), |
| 28 | 28 | 'displayFields' => ['path', 'role'], |
| 29 | 29 | 'editFields' => ['path', 'role'], |
@@ -50,7 +50,7 @@ |
||
| 50 | 50 | |
| 51 | 51 | // $plugin->extendList('path'); |
| 52 | 52 | |
| 53 | - $grid->addDragHandler()->onReorder(function ($order) { |
|
| 53 | + $grid->addDragHandler()->onReorder(function($order) { |
|
| 54 | 54 | foreach (Model\HomePage::create() as $homepage) { |
| 55 | 55 | $homepage->save(['priority' => array_search($homepage['id'], $order)]); |
| 56 | 56 | } |
@@ -11,7 +11,7 @@ discard block |
||
| 11 | 11 | |
| 12 | 12 | class HomePage extends Model |
| 13 | 13 | { |
| 14 | - use HasEpesiConnection; |
|
| 14 | + use HasEpesiConnection; |
|
| 15 | 15 | |
| 16 | 16 | public $table = 'home_pages'; |
| 17 | 17 | |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | parent::init(); |
| 32 | 32 | |
| 33 | 33 | $this->addFields([ |
| 34 | - 'path' => [ |
|
| 34 | + 'path' => [ |
|
| 35 | 35 | 'caption' => __('Page'), |
| 36 | 36 | 'values' => self::list(), |
| 37 | 37 | 'ui' => [ |
@@ -41,23 +41,23 @@ discard block |
||
| 41 | 41 | 'filter' => true |
| 42 | 42 | ], |
| 43 | 43 | ], |
| 44 | - 'role' => [ |
|
| 44 | + 'role' => [ |
|
| 45 | 45 | 'caption' => __('Role'), |
| 46 | 46 | 'values' => Role::get()->pluck('name', 'name')->all(), |
| 47 | 47 | 'ui' => [ |
| 48 | 48 | 'filter' => true |
| 49 | 49 | ] |
| 50 | 50 | ], |
| 51 | - 'date' => [ |
|
| 51 | + 'date' => [ |
|
| 52 | 52 | 'type' => 'date', |
| 53 | 53 | 'caption' => __('Date'), |
| 54 | - 'never_persist' => true, |
|
| 54 | + 'never_persist' => true, |
|
| 55 | 55 | 'ui' => [ |
| 56 | 56 | 'filter' => true |
| 57 | 57 | ] |
| 58 | 58 | ], |
| 59 | 59 | 'priority' => [ |
| 60 | - 'default' => 0 |
|
| 60 | + 'default' => 0 |
|
| 61 | 61 | ], |
| 62 | 62 | ]); |
| 63 | 63 | |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | $this->setOrder('priority'); |
| 66 | 66 | |
| 67 | 67 | $this->onHook(\atk4\data\Model::HOOK_BEFORE_INSERT, function($model, & $data) { |
| 68 | - $data['priority'] = $data['priority']?: $this->action('fx', ['max', 'priority'])->getOne() + 1; |
|
| 68 | + $data['priority'] = $data['priority'] ?: $this->action('fx', ['max', 'priority'])->getOne() + 1; |
|
| 69 | 69 | }); |
| 70 | 70 | } |
| 71 | 71 | |
@@ -78,7 +78,7 @@ discard block |
||
| 78 | 78 | { |
| 79 | 79 | static $cache; |
| 80 | 80 | |
| 81 | - if (! isset($cache)) { |
|
| 81 | + if (!isset($cache)) { |
|
| 82 | 82 | $cache = []; |
| 83 | 83 | foreach (HomePageJoint::collect() as $joint) { |
| 84 | 84 | $cache[$joint->link()] = $joint->caption(); |
@@ -95,7 +95,7 @@ discard block |
||
| 95 | 95 | */ |
| 96 | 96 | public static function ofUser() |
| 97 | 97 | { |
| 98 | - if (! $user = Auth::user()) return; |
|
| 98 | + if (!$user = Auth::user()) return; |
|
| 99 | 99 | |
| 100 | 100 | return self::create()->addCondition('role', $user->roles()->pluck('name')->toArray())->loadAny(); |
| 101 | 101 | } |
@@ -94,7 +94,9 @@ |
||
| 94 | 94 | */ |
| 95 | 95 | public static function ofUser() |
| 96 | 96 | { |
| 97 | - if (! $user = Auth::user()) return; |
|
| 97 | + if (! $user = Auth::user()) { |
|
| 98 | + return; |
|
| 99 | + } |
|
| 98 | 100 | |
| 99 | 101 | return self::create()->addCondition('role', $user->roles()->pluck('name')->toArray())->loadAny(); |
| 100 | 102 | } |
@@ -24,11 +24,11 @@ |
||
| 24 | 24 | |
| 25 | 25 | public function migrate() |
| 26 | 26 | { |
| 27 | - Model\Module::migrate(); |
|
| 27 | + Model\Module::migrate(); |
|
| 28 | 28 | |
| 29 | - Model\Variable::migrate(); |
|
| 29 | + Model\Variable::migrate(); |
|
| 30 | 30 | |
| 31 | - return parent::migrate(); |
|
| 31 | + return parent::migrate(); |
|
| 32 | 32 | } |
| 33 | 33 | |
| 34 | 34 | } |
@@ -8,7 +8,7 @@ discard block |
||
| 8 | 8 | |
| 9 | 9 | class Variable extends Model |
| 10 | 10 | { |
| 11 | - use HasEpesiConnection; |
|
| 11 | + use HasEpesiConnection; |
|
| 12 | 12 | |
| 13 | 13 | /** |
| 14 | 14 | * @var Collection |
@@ -27,12 +27,12 @@ discard block |
||
| 27 | 27 | |
| 28 | 28 | protected function init(): void |
| 29 | 29 | { |
| 30 | - parent::init(); |
|
| 30 | + parent::init(); |
|
| 31 | 31 | |
| 32 | - $this->addFields([ |
|
| 33 | - 'name', |
|
| 34 | - 'value' => ['type' => 'text', 'serialize' => 'json'] |
|
| 35 | - ]); |
|
| 32 | + $this->addFields([ |
|
| 33 | + 'name', |
|
| 34 | + 'value' => ['type' => 'text', 'serialize' => 'json'] |
|
| 35 | + ]); |
|
| 36 | 36 | } |
| 37 | 37 | |
| 38 | 38 | public static function recall($name, $default = null) { |
@@ -57,10 +57,10 @@ discard block |
||
| 57 | 57 | $variable = self::create()->addCondition('name', $name)->tryLoadAny(); |
| 58 | 58 | |
| 59 | 59 | if ($variable->loaded()) { |
| 60 | - $variable->save(compact('value')); |
|
| 60 | + $variable->save(compact('value')); |
|
| 61 | 61 | } |
| 62 | 62 | else { |
| 63 | - $variable->insert(compact('name', 'value')); |
|
| 63 | + $variable->insert(compact('name', 'value')); |
|
| 64 | 64 | } |
| 65 | 65 | } |
| 66 | 66 | |
@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | public $strict_types = false; |
| 21 | 21 | |
| 22 | 22 | private static function cache() { |
| 23 | - if(isset(self::$variables)) return; |
|
| 23 | + if (isset(self::$variables)) return; |
|
| 24 | 24 | |
| 25 | 25 | self::$variables = self::pluck('value', 'name'); |
| 26 | 26 | } |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | } |
| 65 | 65 | } |
| 66 | 66 | |
| 67 | - public static function forget($name, $throwError=true) { |
|
| 67 | + public static function forget($name, $throwError = true) { |
|
| 68 | 68 | self::cache(); |
| 69 | 69 | |
| 70 | 70 | if (!self::$variables->has($name) && $throwError) { |
@@ -20,7 +20,9 @@ discard block |
||
| 20 | 20 | public $strict_types = false; |
| 21 | 21 | |
| 22 | 22 | private static function cache() { |
| 23 | - if(isset(self::$variables)) return; |
|
| 23 | + if(isset(self::$variables)) { |
|
| 24 | + return; |
|
| 25 | + } |
|
| 24 | 26 | |
| 25 | 27 | self::$variables = self::pluck('value', 'name'); |
| 26 | 28 | } |
@@ -38,7 +40,9 @@ discard block |
||
| 38 | 40 | public static function recall($name, $default = null) { |
| 39 | 41 | self::cache(); |
| 40 | 42 | |
| 41 | - if (!self::$variables->has($name)) return $default; |
|
| 43 | + if (!self::$variables->has($name)) { |
|
| 44 | + return $default; |
|
| 45 | + } |
|
| 42 | 46 | |
| 43 | 47 | return self::$variables->get($name, $default) ?? $default; |
| 44 | 48 | } |
@@ -58,8 +62,7 @@ discard block |
||
| 58 | 62 | |
| 59 | 63 | if ($variable->loaded()) { |
| 60 | 64 | $variable->save(compact('value')); |
| 61 | - } |
|
| 62 | - else { |
|
| 65 | + } else { |
|
| 63 | 66 | $variable->insert(compact('name', 'value')); |
| 64 | 67 | } |
| 65 | 68 | } |
@@ -7,19 +7,19 @@ |
||
| 7 | 7 | |
| 8 | 8 | class Module extends Model |
| 9 | 9 | { |
| 10 | - use HasEpesiConnection; |
|
| 10 | + use HasEpesiConnection; |
|
| 11 | 11 | |
| 12 | - public $table = 'modules'; |
|
| 12 | + public $table = 'modules'; |
|
| 13 | 13 | |
| 14 | - protected function init(): void |
|
| 15 | - { |
|
| 16 | - parent::init(); |
|
| 14 | + protected function init(): void |
|
| 15 | + { |
|
| 16 | + parent::init(); |
|
| 17 | 17 | |
| 18 | - $this->addFields([ |
|
| 19 | - 'class', |
|
| 20 | - 'alias', |
|
| 21 | - 'priority' => ['default' => 0], |
|
| 22 | - 'state' => ['default' => 1] |
|
| 23 | - ]); |
|
| 24 | - } |
|
| 18 | + $this->addFields([ |
|
| 19 | + 'class', |
|
| 20 | + 'alias', |
|
| 21 | + 'priority' => ['default' => 0], |
|
| 22 | + 'state' => ['default' => 1] |
|
| 23 | + ]); |
|
| 24 | + } |
|
| 25 | 25 | } |
@@ -7,18 +7,18 @@ |
||
| 7 | 7 | |
| 8 | 8 | class SQL extends \atk4\data\Persistence\Sql |
| 9 | 9 | { |
| 10 | - /** |
|
| 11 | - * Take a laravel connection and pass it to ATK Data |
|
| 12 | - * |
|
| 13 | - * @return \atk4\data\Persistence\SQL |
|
| 14 | - */ |
|
| 15 | - public function __construct(DatabaseManager $database) |
|
| 16 | - { |
|
| 17 | - $pdo = $database->connection()->getPdo(); |
|
| 10 | + /** |
|
| 11 | + * Take a laravel connection and pass it to ATK Data |
|
| 12 | + * |
|
| 13 | + * @return \atk4\data\Persistence\SQL |
|
| 14 | + */ |
|
| 15 | + public function __construct(DatabaseManager $database) |
|
| 16 | + { |
|
| 17 | + $pdo = $database->connection()->getPdo(); |
|
| 18 | 18 | |
| 19 | - // temporary fix of atk4/data inability to handle PREPARE on 'is null' |
|
| 20 | - $pdo->setAttribute(\PDO::ATTR_EMULATE_PREPARES, true); |
|
| 19 | + // temporary fix of atk4/data inability to handle PREPARE on 'is null' |
|
| 20 | + $pdo->setAttribute(\PDO::ATTR_EMULATE_PREPARES, true); |
|
| 21 | 21 | |
| 22 | - parent::__construct(Connection::connect($pdo)); |
|
| 23 | - } |
|
| 22 | + parent::__construct(Connection::connect($pdo)); |
|
| 23 | + } |
|
| 24 | 24 | } |
@@ -27,27 +27,27 @@ |
||
| 27 | 27 | return new JsModal($this->title, $this->virtualPage); |
| 28 | 28 | } |
| 29 | 29 | |
| 30 | - protected function getContents(VirtualPage $vp) |
|
| 31 | - { |
|
| 32 | - $vp->add([ |
|
| 33 | - new LaunchButton([ |
|
| 34 | - 'label' => 'Test Button 1', |
|
| 35 | - 'icon' => 'user' |
|
| 36 | - ]) |
|
| 37 | - ])->link(URL::to('/')); |
|
| 30 | + protected function getContents(VirtualPage $vp) |
|
| 31 | + { |
|
| 32 | + $vp->add([ |
|
| 33 | + new LaunchButton([ |
|
| 34 | + 'label' => 'Test Button 1', |
|
| 35 | + 'icon' => 'user' |
|
| 36 | + ]) |
|
| 37 | + ])->link(URL::to('/')); |
|
| 38 | 38 | |
| 39 | - $vp->add([ |
|
| 40 | - new LaunchButton([ |
|
| 41 | - 'label' => 'Test Button 2', |
|
| 42 | - 'icon' => 'car' |
|
| 43 | - ]) |
|
| 44 | - ]); |
|
| 39 | + $vp->add([ |
|
| 40 | + new LaunchButton([ |
|
| 41 | + 'label' => 'Test Button 2', |
|
| 42 | + 'icon' => 'car' |
|
| 43 | + ]) |
|
| 44 | + ]); |
|
| 45 | 45 | |
| 46 | - $vp->add([ |
|
| 47 | - new LaunchButton([ |
|
| 48 | - 'label' => 'Test Button 3', |
|
| 49 | - 'icon' => 'bus' |
|
| 50 | - ]) |
|
| 51 | - ]); |
|
| 52 | - } |
|
| 46 | + $vp->add([ |
|
| 47 | + new LaunchButton([ |
|
| 48 | + 'label' => 'Test Button 3', |
|
| 49 | + 'icon' => 'bus' |
|
| 50 | + ]) |
|
| 51 | + ]); |
|
| 52 | + } |
|
| 53 | 53 | } |
@@ -10,53 +10,53 @@ discard block |
||
| 10 | 10 | |
| 11 | 11 | class LayoutView extends \atk4\ui\Layout |
| 12 | 12 | { |
| 13 | - use SessionTrait; |
|
| 13 | + use SessionTrait; |
|
| 14 | 14 | |
| 15 | - /** |
|
| 16 | - * @var View\NavMenu |
|
| 17 | - */ |
|
| 18 | - public $menuLeft; // vertical menu |
|
| 15 | + /** |
|
| 16 | + * @var View\NavMenu |
|
| 17 | + */ |
|
| 18 | + public $menuLeft; // vertical menu |
|
| 19 | 19 | |
| 20 | - /** |
|
| 21 | - * @var \atk4\ui\Menu |
|
| 22 | - */ |
|
| 23 | - public $menuTop; // horizontal menu |
|
| 20 | + /** |
|
| 21 | + * @var \atk4\ui\Menu |
|
| 22 | + */ |
|
| 23 | + public $menuTop; // horizontal menu |
|
| 24 | 24 | |
| 25 | - /** |
|
| 26 | - * @var \atk4\ui\Menu |
|
| 27 | - */ |
|
| 28 | - public $menuRight; // vertical pull-down |
|
| 25 | + /** |
|
| 26 | + * @var \atk4\ui\Menu |
|
| 27 | + */ |
|
| 28 | + public $menuRight; // vertical pull-down |
|
| 29 | 29 | |
| 30 | - /** |
|
| 31 | - * @var View\ActionBar |
|
| 32 | - */ |
|
| 33 | - public $actionBar; |
|
| 34 | - public $locationBar; |
|
| 30 | + /** |
|
| 31 | + * @var View\ActionBar |
|
| 32 | + */ |
|
| 33 | + public $actionBar; |
|
| 34 | + public $locationBar; |
|
| 35 | 35 | |
| 36 | - public $burger = true; // burger menu item |
|
| 36 | + public $burger = true; // burger menu item |
|
| 37 | 37 | |
| 38 | - /* |
|
| 38 | + /* |
|
| 39 | 39 | * Whether or not left Menu is visible on Page load. |
| 40 | 40 | */ |
| 41 | - public $isMenuLeftVisible = true; |
|
| 41 | + public $isMenuLeftVisible = true; |
|
| 42 | 42 | |
| 43 | - public $defaultTemplate = 'layout/admin.html'; |
|
| 43 | + public $defaultTemplate = 'layout/admin.html'; |
|
| 44 | 44 | |
| 45 | - protected $location; |
|
| 45 | + protected $location; |
|
| 46 | 46 | |
| 47 | - protected function init(): void |
|
| 48 | - { |
|
| 49 | - parent::init(); |
|
| 47 | + protected function init(): void |
|
| 48 | + { |
|
| 49 | + parent::init(); |
|
| 50 | 50 | |
| 51 | - $this->initMenuTop(); |
|
| 52 | - $this->initActionBar(); |
|
| 51 | + $this->initMenuTop(); |
|
| 52 | + $this->initActionBar(); |
|
| 53 | 53 | |
| 54 | 54 | // if (request()->pjax()) return; |
| 55 | 55 | |
| 56 | - $this->initMenuLeft(); |
|
| 57 | - $this->initMenuRight(); |
|
| 56 | + $this->initMenuLeft(); |
|
| 57 | + $this->initMenuRight(); |
|
| 58 | 58 | |
| 59 | - $this->template->trySet('version', $this->getApp()->version); |
|
| 59 | + $this->template->trySet('version', $this->getApp()->version); |
|
| 60 | 60 | |
| 61 | 61 | // $this->js(true, null, 'body')->niceScroll(); |
| 62 | 62 | |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | // if (event.originalEvent.persisted) { |
| 66 | 66 | // window.location.reload(); |
| 67 | 67 | // }')])); |
| 68 | - } |
|
| 68 | + } |
|
| 69 | 69 | |
| 70 | 70 | /** |
| 71 | 71 | * @return static |
@@ -127,40 +127,40 @@ discard block |
||
| 127 | 127 | $this->menuRight = $this->menuTop->add(new View\RightMenu(['ui' => false]), 'RightMenu')->addClass('right menu')->removeClass('item'); |
| 128 | 128 | } |
| 129 | 129 | |
| 130 | - protected function initMenuLeft() |
|
| 131 | - { |
|
| 132 | - if ($this->menuLeft) return; |
|
| 130 | + protected function initMenuLeft() |
|
| 131 | + { |
|
| 132 | + if ($this->menuLeft) return; |
|
| 133 | 133 | |
| 134 | - $this->menuLeft = View\NavMenu::addTo($this, 'left vertical labeled sidebar', ['LeftMenu']); |
|
| 134 | + $this->menuLeft = View\NavMenu::addTo($this, 'left vertical labeled sidebar', ['LeftMenu']); |
|
| 135 | 135 | |
| 136 | - if ($this->burger) { |
|
| 137 | - $this->isMenuLeftVisible = $this->learn('menu', $this->isMenuLeftVisible); |
|
| 136 | + if ($this->burger) { |
|
| 137 | + $this->isMenuLeftVisible = $this->learn('menu', $this->isMenuLeftVisible); |
|
| 138 | 138 | |
| 139 | - $this->burger->add([\atk4\ui\Icon::class, 'content'])->on('click', [ |
|
| 140 | - (new jQuery('.ui.left.sidebar'))->toggleClass('visible'), |
|
| 141 | - (new jQuery('.epesi-logo'))->toggleClass('expanded'), |
|
| 142 | - (new jQuery('body'))->toggleClass('atk-leftMenu-visible'), |
|
| 143 | - \atk4\ui\JsCallback::addTo($this->burger)->set(function($jsCallback, $visible) { |
|
| 144 | - $this->memorize('menu', filter_var($visible, FILTER_VALIDATE_BOOLEAN)); |
|
| 145 | - }, [$this->menuLeft->js(true)->hasClass('visible')]) |
|
| 146 | - ]); |
|
| 147 | - } |
|
| 148 | - } |
|
| 139 | + $this->burger->add([\atk4\ui\Icon::class, 'content'])->on('click', [ |
|
| 140 | + (new jQuery('.ui.left.sidebar'))->toggleClass('visible'), |
|
| 141 | + (new jQuery('.epesi-logo'))->toggleClass('expanded'), |
|
| 142 | + (new jQuery('body'))->toggleClass('atk-leftMenu-visible'), |
|
| 143 | + \atk4\ui\JsCallback::addTo($this->burger)->set(function($jsCallback, $visible) { |
|
| 144 | + $this->memorize('menu', filter_var($visible, FILTER_VALIDATE_BOOLEAN)); |
|
| 145 | + }, [$this->menuLeft->js(true)->hasClass('visible')]) |
|
| 146 | + ]); |
|
| 147 | + } |
|
| 148 | + } |
|
| 149 | 149 | |
| 150 | - protected function initActionBar() |
|
| 151 | - { |
|
| 152 | - if (!$this->actionBar) { |
|
| 153 | - $this->actionBar = View\ActionBar::addTo($this, [], ['ActionBar']); |
|
| 154 | - } |
|
| 150 | + protected function initActionBar() |
|
| 151 | + { |
|
| 152 | + if (!$this->actionBar) { |
|
| 153 | + $this->actionBar = View\ActionBar::addTo($this, [], ['ActionBar']); |
|
| 154 | + } |
|
| 155 | 155 | |
| 156 | - return $this; |
|
| 157 | - } |
|
| 156 | + return $this; |
|
| 157 | + } |
|
| 158 | 158 | |
| 159 | - public function renderView(): void |
|
| 160 | - { |
|
| 161 | - if ($this->menuLeft && $this->isMenuLeftVisible) { |
|
| 162 | - $this->menuLeft->addClass('visible'); |
|
| 163 | - } |
|
| 164 | - parent::renderView(); |
|
| 165 | - } |
|
| 159 | + public function renderView(): void |
|
| 160 | + { |
|
| 161 | + if ($this->menuLeft && $this->isMenuLeftVisible) { |
|
| 162 | + $this->menuLeft->addClass('visible'); |
|
| 163 | + } |
|
| 164 | + parent::renderView(); |
|
| 165 | + } |
|
| 166 | 166 | } |
@@ -15,17 +15,17 @@ discard block |
||
| 15 | 15 | /** |
| 16 | 16 | * @var View\NavMenu |
| 17 | 17 | */ |
| 18 | - public $menuLeft; // vertical menu |
|
| 18 | + public $menuLeft; // vertical menu |
|
| 19 | 19 | |
| 20 | 20 | /** |
| 21 | 21 | * @var \atk4\ui\Menu |
| 22 | 22 | */ |
| 23 | - public $menuTop; // horizontal menu |
|
| 23 | + public $menuTop; // horizontal menu |
|
| 24 | 24 | |
| 25 | 25 | /** |
| 26 | 26 | * @var \atk4\ui\Menu |
| 27 | 27 | */ |
| 28 | - public $menuRight; // vertical pull-down |
|
| 28 | + public $menuRight; // vertical pull-down |
|
| 29 | 29 | |
| 30 | 30 | /** |
| 31 | 31 | * @var View\ActionBar |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | public $actionBar; |
| 34 | 34 | public $locationBar; |
| 35 | 35 | |
| 36 | - public $burger = true; // burger menu item |
|
| 36 | + public $burger = true; // burger menu item |
|
| 37 | 37 | |
| 38 | 38 | /* |
| 39 | 39 | * Whether or not left Menu is visible on Page load. |
@@ -100,7 +100,9 @@ discard block |
||
| 100 | 100 | |
| 101 | 101 | protected function initMenuTop() |
| 102 | 102 | { |
| 103 | - if ($this->menuTop) return; |
|
| 103 | + if ($this->menuTop) { |
|
| 104 | + return; |
|
| 105 | + } |
|
| 104 | 106 | |
| 105 | 107 | $this->menuTop = Menu::addTo($this, ['atk-topMenu fixed horizontal', 'element' => 'header'], ['TopMenu']); |
| 106 | 108 | |
@@ -122,14 +124,18 @@ discard block |
||
| 122 | 124 | |
| 123 | 125 | protected function initMenuRight() |
| 124 | 126 | { |
| 125 | - if ($this->menuRight) return; |
|
| 127 | + if ($this->menuRight) { |
|
| 128 | + return; |
|
| 129 | + } |
|
| 126 | 130 | |
| 127 | 131 | $this->menuRight = $this->menuTop->add(new View\RightMenu(['ui' => false]), 'RightMenu')->addClass('right menu')->removeClass('item'); |
| 128 | 132 | } |
| 129 | 133 | |
| 130 | 134 | protected function initMenuLeft() |
| 131 | 135 | { |
| 132 | - if ($this->menuLeft) return; |
|
| 136 | + if ($this->menuLeft) { |
|
| 137 | + return; |
|
| 138 | + } |
|
| 133 | 139 | |
| 134 | 140 | $this->menuLeft = View\NavMenu::addTo($this, 'left vertical labeled sidebar', ['LeftMenu']); |
| 135 | 141 | |