Merge pull request #13 from sazanrjb/role-edit-error

Error in Role Management while editing any role
FTXInfotech · Oct 17, 2017 · 5b3c345 · 5b3c345
2 parents e88004a + 7adb1ec
commit 5b3c345
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -1,7 +1,10 @@
 {
-  "/js/frontend.js": "/js/frontend.a61ecd930901e421f8c6.js",
-  "/js/backend.js": "/js/backend.2a9b8e6342d3c8317e81.js",
-  "/mix.js": "/mix.247ab120fe7680658924.js",
-  "/css/frontend.css": "/css/frontend.3af0a6cbd7d1d8d042f2a37e97008b7c.css",
-  "/css/backend.css": "/css/backend.fb09a6c9c42e242a03eb7f859ccfdc76.css"
+  "/js/frontend.js": "/js/frontend.580464ef773e2d214ce1.js",
+  "/js/backend.js": "/js/backend.10c0d698ee8a6aeda110.js",
+  "/mix.js": "/mix.9b87a1da741f957f3f09.js",
+  "/css/frontend.css": "/css/frontend.7816482bc976933449305b471c854d53.css",
+  "/css/backend.css": "/css/backend.d451c415735a1ad4f8c0bc1506ab13f7.css",
+  "/css/backend-custom.css": "/css/backend-custom.50f14193ab908e3cf471dea6cb6616ae.css",
+  "/js/backend-custom.js": "/js/backend-custom.c4cbd263073239b6890a7b1556356e0c.js",
+  "/js/dataTable.js": "/js/dataTable.f968d300a6a0b871f138f114361259c8.js"
 }
diff --git a/public/mix.9b87a1da741f957f3f09.js b/public/mix.9b87a1da741f957f3f09.js
diff --git a/resources/views/backend/access/roles/edit.blade.php b/resources/views/backend/access/roles/edit.blade.php
@@ -47,7 +47,7 @@
                                     @if ($permissions->count())
                                         @foreach ($permissions as $perm)
                                         <label class="control control--checkbox">
-                                            <input type="checkbox" name="permissions[{{ $perm->id }}]" value="{{ $perm->id }}" id="perm_{{ $perm->id }}" {{ is_array(old('permissions')) ? (in_array($perm->id, old('permissions')) ? 'checked' : '') : (in_array($perm->id, $role_permissions) ? 'checked' : '') }} /> <label for="perm_{{ $perm->id }}">{{ $perm->display_name }}</label>
+                                            <input type="checkbox" name="permissions[{{ $perm->id }}]" value="{{ $perm->id }}" id="perm_{{ $perm->id }}" {{ is_array(old('permissions')) ? (in_array($perm->id, old('permissions')) ? 'checked' : '') : (in_array($perm->id, $rolePermissions) ? 'checked' : '') }} /> <label for="perm_{{ $perm->id }}">{{ $perm->display_name }}</label>
                                             <div class="control__indicator"></div>
                                             </label>
                                             <br/>