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

Commit 93a4bfb

Browse files
ctf0ctf0
committed
v3.2.6
- fix installation error - fix multi select not rendering - fix tinymce jquery issue - correct edit/create pages mis-alignments - change vue components names - add mising multi-ref - fix the damn premission cache issue - update wiki
1 parent 902bff5 commit 93a4bfb

22 files changed

+319
-288
lines changed

‎README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ npm install vue axios vue-tippy@v1 vuedraggable vue-notif vue-multi-ref vue-awes
6868
+ if you are having issues [Check](https://ctf0.wordpress.com/2017/09/12/laravel-mix-es6/).
6969

7070
```js
71-
require('./../vendor/SimpleMenu/js/manager')
71+
require('../vendor/SimpleMenu/js/manager')
7272

7373
new Vue({
7474
el: '#app'
@@ -189,7 +189,8 @@ return [
189189
<br>
190190

191191
## Usage
192-
[Wiki](https://github.com/ctf0/simple-menu/wiki/Usage)
192+
- visit `localhost:8000/admin`
193+
- [Wiki](https://github.com/ctf0/simple-menu/wiki/Usage)
193194

194195
<br>
195196

‎src/Controllers/Admin/PagesController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public function create()
3535
{
3636
$locales = SimpleMenu::AppLocales();
3737
$roles = Role::pluck('name', 'name');
38-
$permissions = $this->cache->get('spatie.permission.cache')->pluck('name', 'name');
38+
$permissions = Permission::pluck('name', 'name');
3939
$menus = $this->cache->tags('sm')->get('menus')->pluck('name', 'id');
4040
$templates = array_unique($this->cache->tags('sm')->get('pages')->pluck('template')->filter()->all());
4141

@@ -79,7 +79,7 @@ public function edit($id)
7979
{
8080
$locales = SimpleMenu::AppLocales();
8181
$roles = Role::pluck('name', 'name');
82-
$permissions = $this->cache->get('spatie.permission.cache')->pluck('name', 'name');
82+
$permissions = Permission::pluck('name', 'name');
8383
$page = $this->cache->tags('sm')->get('pages')->find($id) ?: abort(404);
8484
$menus = $this->cache->tags('sm')->get('menus')->pluck('name', 'id');
8585
$templates = array_unique($this->cache->tags('sm')->get('pages')->pluck('template')->filter()->all());

‎src/Controllers/Admin/PermissionsController.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class PermissionsController extends BaseController
1818
*/
1919
public function index()
2020
{
21-
$permissions = $this->cache->get('spatie.permission.cache');
21+
$permissions = Permission::get();
2222

2323
return view("{$this->adminPath}.permissions.index", compact('permissions'));
2424
}
@@ -62,7 +62,7 @@ public function store(Request $request)
6262
*/
6363
public function edit($id)
6464
{
65-
$permission = $this->cache->get('spatie.permission.cache')->find($id);
65+
$permission = Permission::find($id);
6666

6767
return view("{$this->adminPath}.permissions.edit", compact('permission'));
6868
}
@@ -81,7 +81,7 @@ public function update($id, Request $request)
8181
'name' => 'required|unique:permissions,name,' . $id,
8282
]);
8383

84-
$this->cache->get('spatie.permission.cache')->find($id)->update($request->all());
84+
Permission::find($id)->update($request->all());
8585

8686
$this->clearCache();
8787

‎src/Controllers/Admin/RolesController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public function index()
3131
*/
3232
public function create()
3333
{
34-
$permissions = $this->cache->get('spatie.permission.cache')->pluck('name', 'name');
34+
$permissions = Permission::pluck('name', 'name');
3535

3636
return view("{$this->adminPath}.roles.create", compact('permissions'));
3737
}
@@ -69,7 +69,7 @@ public function store(Request $request)
6969
public function edit($id)
7070
{
7171
$role = Role::find($id);
72-
$permissions = $this->cache->get('spatie.permission.cache')->pluck('name', 'name');
72+
$permissions = Permission::pluck('name', 'name');
7373

7474
return view("{$this->adminPath}.roles.edit", compact('role', 'permissions'));
7575
}

‎src/Controllers/Admin/UsersController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public function index()
3232
public function create()
3333
{
3434
$roles = Role::pluck('name', 'name');
35-
$permissions = $this->cache->get('spatie.permission.cache')->pluck('name', 'name');
35+
$permissions = Permission::pluck('name', 'name');
3636

3737
return view("{$this->adminPath}.users.create", compact('roles', 'permissions'));
3838
}
@@ -76,7 +76,7 @@ public function edit($id)
7676
{
7777
$user = $this->cache->get('sm-users')->find($id) ?: abort(404);
7878
$roles = Role::pluck('name', 'name');
79-
$permissions = $this->cache->get('spatie.permission.cache')->pluck('name', 'name');
79+
$permissions = Permission::pluck('name', 'name');
8080

8181
return view("{$this->adminPath}.users.edit", compact('user', 'roles', 'permissions'));
8282
}

‎src/SimpleMenu.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ public function __construct()
2222
$this->listFileDir = config('simpleMenu.routeListPath');
2323
$this->localeCodes = array_keys(LaravelLocalization::getSupportedLocales());
2424

25-
static::create_LFD($this->listFileDir);
25+
if ($this->listFileDir !== '') {
26+
static::create_LFD($this->listFileDir);
27+
}
2628

2729
if (!app()->runningInConsole()) {
2830
// create caches

‎src/database/seeds/DatabaseSeeder.example

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ class DatabaseSeeder extends Seeder
99
*/
1010
public function run()
1111
{
12+
Cache::flush();
13+
1214
$this->call(PagesTableSeeder::class);
1315
$this->call(MenusTableSeeder::class);
1416
$this->call(MenuPagesTableSeeder::class);

‎src/database/seeds/PagesTableSeeder.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,30 +17,30 @@ public function run()
1717

1818
while ($i <= 20) {
1919
$en = $faker->unique()->city;
20-
$fr = $faker->unique()->city;
20+
$es = $faker->unique()->city;
2121

2222
$pageModel->create([
2323
'template' => 'SimpleMenu::template-example',
2424
'route_name'=> str_slug($en),
2525
'title' => [
2626
'en' => title_case($en),
27-
'fr' => title_case($fr),
27+
'es' => title_case($es),
2828
],
2929
'body' => [
3030
'en' => $faker->text(),
31-
'fr' => $faker->text(),
31+
'es' => $faker->text(),
3232
],
3333
'desc' => [
3434
'en' => $faker->text(),
35-
'fr' => $faker->text(),
35+
'es' => $faker->text(),
3636
],
3737
'prefix' => [
3838
'en' => str_slug($faker->unique()->country),
39-
'fr' => str_slug($faker->unique()->country),
39+
'es' => str_slug($faker->unique()->country),
4040
],
4141
'url' => [
4242
'en' => str_slug($en),
43-
'fr' => str_slug($fr),
43+
'es' => str_slug($es),
4444
],
4545
]);
4646

‎src/resources/assets/js/bulma/index-comp.vue renamed to ‎src/resources/assets/js/bulma/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import Search from './mixins/search'
33
44
export default {
55
name: 'index-comp',
6-
props: ['count'],
76
mixins: [Search],
7+
props: ['count'],
88
data() {
99
return {
1010
itemsCount: this.count,

‎src/resources/assets/js/bulma/menu-comp.vue renamed to ‎src/resources/assets/js/bulma/menu.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<script>
22
import draggable from 'vuedraggable'
3-
import MenuChild from './menu-comp_childs.vue'
3+
import MenuChild from './menu_childs.vue'
44
import menu from './mixins/menu'
55
66
export default {

0 commit comments

Comments
 (0)