Skip to content
This repository was archived by the owner on Jan 3, 2023. It is now read-only.

Commit a2ae73d

Browse files
ctf0ctf0
committed
v3.3.7
1 parent 0c7e2bf commit a2ae73d

28 files changed

+239
-158
lines changed

‎README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ Create menus & pages that support (multiLocale "title, url, body, ...", nesting,
3535
+ if you are having issues [Check](https://ctf0.wordpress.com/2017/09/12/laravel-mix-es6/).
3636

3737
```js
38+
// app.js
39+
40+
window.Vue = require('vue')
41+
3842
require('../vendor/SimpleMenu/js/manager')
3943
4044
new Vue({

‎src/Controllers/Admin/MenusController.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ public function update($id, Request $request)
103103

104104
// update and trigger events
105105
$menu->update($request->except('saveList'));
106+
$menu->touch();
106107

107108
return back()->with('status', trans('SimpleMenu::messages.model_updated'));
108109
}

‎src/Controllers/Admin/PagesController.php

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ public function store(Request $request)
5353

5454
$img = $this->getImage($request->cover);
5555
$page = $this->pageModel->create(array_merge(['cover'=>$img], $this->cleanEmptyTranslations($request)));
56-
$roles = $request->input('roles') ?: [];
57-
$permissions = $request->input('permissions') ?: [];
58-
$menus = $request->input('menus') ?: [];
56+
$roles = $request->roles ?: [];
57+
$permissions = $request->permissions ?: [];
58+
$menus = $request->menus ?: [];
5959

6060
$page->assignRole($roles);
6161
$page->givePermissionTo($permissions);
@@ -101,19 +101,28 @@ public function update($id, Request $request)
101101

102102
$img = $this->getImage($request->cover);
103103
$page = $this->getItem($id);
104-
$roles = $request->input('roles') ?: [];
105-
$permissions = $request->input('permissions') ?: [];
106-
$menus = $request->input('menus') ?: [];
104+
$roles = $request->roles;
105+
$permissions = $request->permissions;
106+
$menus = $request->menus ?: [];
107107

108108
$page->update(array_merge(['cover'=>$img], $this->cleanEmptyTranslations($request)));
109-
$page->syncRoles($roles);
110-
$page->syncPermissions($permissions);
109+
110+
if (!$this->checkBeforeAssign($page->roles, $roles)) {
111+
$page->syncRoles($roles ?: []);
112+
}
113+
114+
if (!$this->checkBeforeAssign($page->permissions, $permissions)) {
115+
$page->syncPermissions($permissions ?: []);
116+
}
117+
111118
$page->syncMenus($menus);
112119

113120
if (!is_null($request->controllerFile)) {
114121
$this->actionFileContent($request->action, 'update', $request->controllerFile);
115122
}
116123

124+
$page->touch();
125+
117126
return back()->with('status', trans('SimpleMenu::messages.model_updated'));
118127
}
119128

‎src/Controllers/Admin/PermissionsController.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ public function update($id, Request $request)
8181
]);
8282

8383
$this->permissionModel->findOrFail($id)->update($request->all());
84+
$this->permissionModel->touch();
8485

8586
$this->clearCache();
8687

‎src/Controllers/Admin/RolesController.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public function store(Request $request)
4848
]);
4949

5050
$role = $this->roleModel->create($request->except('permissions'));
51-
$permissions = $request->input('permissions') ?: [];
51+
$permissions = $request->permissions ?: [];
5252

5353
$role->givePermissionTo($permissions);
5454

@@ -87,10 +87,11 @@ public function update($id, Request $request)
8787
]);
8888

8989
$role = $this->roleModel->findOrFail($id);
90-
$permissions = $request->input('permissions') ?: [];
90+
$permissions = $request->permissions ?: [];
9191

9292
$role->update($request->except('permissions'));
9393
$role->syncPermissions($permissions);
94+
$role->touch();
9495

9596
$this->clearCache();
9697

‎src/Controllers/Admin/Traits/MenuOps.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public function getMenuPages($id)
2020
->sortBy('pivot_order')
2121
->each(function ($item) {
2222
$item['from'] = 'pages';
23-
});
23+
})->values()->all();
2424

2525
$allPages = $this->cache->tags('sm')->get('pages')->diff($pages)->each(function ($item) {
2626
$item['from'] = 'allPages';

‎src/Controllers/Admin/Traits/UserPageOps.php

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,21 @@ protected function getImage($img)
88
{
99
return $img;
1010
}
11+
12+
/**
13+
* check if model items are the same as the request items.
14+
* fix spatie role & perm detach then attach model relation.
15+
*
16+
* @param [type] $item [description]
17+
* @param [type] $input [description]
18+
*
19+
* @return [type] [description]
20+
*/
21+
protected function checkBeforeAssign($item, $input)
22+
{
23+
$self = $item->pluck('name')->sort()->values()->all();
24+
$new = collect($input)->sort()->values()->all();
25+
26+
return $self === $new;
27+
}
1128
}

‎src/Controllers/Admin/UsersController.php

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ public function store(Request $request)
5252

5353
$img = $this->getImage($request->avatar);
5454
$user = $this->userModel->create(array_merge(['avatar'=>$img], $request->except(['roles', 'permissions'])));
55-
$roles = $request->input('roles') ?: [];
56-
$permissions = $request->input('permissions') ?: [];
55+
$roles = $request->roles ?: [];
56+
$permissions = $request->permissions ?: [];
5757

5858
$user->assignRole($roles);
5959
$user->givePermissionTo($permissions);
@@ -95,13 +95,21 @@ public function update($id, Request $request)
9595
]);
9696

9797
$user = $this->userModel->findOrFail($id);
98-
$roles = $request->input('roles') ?: [];
99-
$permissions = $request->input('permissions') ?: [];
10098
$img = $this->getImage($request->avatar);
99+
$roles = $request->roles;
100+
$permissions = $request->permissions;
101101

102102
$user->update(array_merge(['avatar'=>$img], $request->except(['roles', 'permissions'])));
103-
$user->syncRoles($roles);
104-
$user->syncPermissions($permissions);
103+
104+
if (!$this->checkBeforeAssign($user->roles, $roles)) {
105+
$user->syncRoles($roles ?: []);
106+
}
107+
108+
if (!$this->checkBeforeAssign($user->permissions, $permissions)) {
109+
$user->syncPermissions($permissions ?: []);
110+
}
111+
112+
$user->touch();
105113

106114
return back()->with('status', trans('SimpleMenu::messages.model_updated'));
107115
}

‎src/Controllers/BaseController.php

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,17 @@ public function __construct()
2525
parent::__construct();
2626
}
2727

28-
$config = config('simpleMenu');
29-
$this->cache = app('cache');
30-
$this->adminPath = 'SimpleMenu::admin';
31-
$this->crud_prefix = array_get($config, 'crud_prefix');
32-
$this->userModel = app(array_get($config, 'models.user'));
33-
$this->pageModel = app(array_get($config, 'models.page'));
34-
$this->menuModel = app(array_get($config, 'models.menu'));
35-
36-
$this->roleModel = app(config('permission.models.role'));
37-
$this->permissionModel = app(config('permission.models.permission'));
28+
$sm_config = config('simpleMenu');
29+
$sp_config = config('permission');
30+
31+
$this->cache = app('cache');
32+
$this->adminPath = 'SimpleMenu::admin';
33+
$this->crud_prefix = array_get($sm_config, 'crud_prefix');
34+
$this->userModel = app(array_get($sm_config, 'models.user'));
35+
$this->pageModel = app(array_get($sm_config, 'models.page'));
36+
$this->menuModel = app(array_get($sm_config, 'models.menu'));
37+
38+
$this->roleModel = app(array_get($sp_config, 'models.role'));
39+
$this->permissionModel = app(array_get($sp_config, 'models.permission'));
3840
}
3941
}

‎src/SimpleMenu.php

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,19 @@
33
namespace ctf0\SimpleMenu;
44

55
use ctf0\SimpleMenu\Traits\Ops;
6-
use ctf0\SimpleMenu\Traits\MenusTrait;
7-
use ctf0\SimpleMenu\Traits\RoutesTrait;
8-
use ctf0\SimpleMenu\Traits\NavigationTrait;
6+
use ctf0\SimpleMenu\Traits\Menus;
7+
use ctf0\SimpleMenu\Traits\Routes;
8+
use ctf0\SimpleMenu\Traits\Navigation;
9+
use ctf0\SimpleMenu\Traits\PackageRoutes;
910
use Mcamara\LaravelLocalization\Facades\LaravelLocalization;
1011

1112
class SimpleMenu
1213
{
13-
use RoutesTrait, MenusTrait, NavigationTrait, Ops;
14+
use Routes,
15+
Menus,
16+
Navigation,
17+
Ops,
18+
PackageRoutes;
1419

1520
protected $listFileDir;
1621
protected $localeCodes;

0 commit comments

Comments
 (0)