Procházet zdrojové kódy

fix: disable block user on admin role

Muhammad Iqbal Afandi před 3 roky
rodič
revize
fbca12f54c

+ 12
- 11
app/Http/Controllers/UserController.php Zobrazit soubor

@@ -40,8 +40,9 @@ class UserController extends Controller
40 40
                     'name' => $user->name,
41 41
                     'email' => $user->email,
42 42
                     'role' => $user->role->name,
43
-                    'status' => $user->status,
44
-                ]),
43
+                    'role_id' => $user->role_id,
44
+                    'status' => $user->status
45
+                ])
45 46
         ]);
46 47
     }
47 48
 
@@ -57,8 +58,8 @@ class UserController extends Controller
57 58
                 ->get()
58 59
                 ->transform(fn($role) => [
59 60
                     'label' => $role->name,
60
-                    'value' => $role->id,
61
-                ]),
61
+                    'value' => $role->id
62
+                ])
62 63
         ]);
63 64
     }
64 65
 
@@ -89,14 +90,14 @@ class UserController extends Controller
89 90
                 'name' => $user->name,
90 91
                 'phone' => $user->phone,
91 92
                 'email' => $user->email,
92
-                'role_id' => $user->role_id,
93
+                'role_id' => $user->role_id
93 94
             ],
94 95
             'roles' => Role::whereNotIn('id', [1])
95 96
                 ->get()
96 97
                 ->transform(fn($role) => [
97 98
                     'label' => $role->name,
98
-                    'value' => $role->id,
99
-                ]),
99
+                    'value' => $role->id
100
+                ])
100 101
         ]);
101 102
     }
102 103
 
@@ -114,14 +115,14 @@ class UserController extends Controller
114 115
                 'name' => $user->name,
115 116
                 'phone' => $user->phone,
116 117
                 'email' => $user->email,
117
-                'role_id' => $user->role_id,
118
+                'role_id' => $user->role_id
118 119
             ],
119 120
             'roles' => Role::whereNotIn('id', [1])
120 121
                 ->get()
121 122
                 ->transform(fn($role) => [
122 123
                     'label' => $role->name,
123
-                    'value' => $role->id,
124
-                ]),
124
+                    'value' => $role->id
125
+                ])
125 126
         ]);
126 127
     }
127 128
 
@@ -138,7 +139,7 @@ class UserController extends Controller
138 139
             'name' => $request->name,
139 140
             'phone' => $request->phone ?? $user->phone,
140 141
             'email' => $request->email,
141
-            'role_id' => $request->role_id,
142
+            'role_id' => $request->role_id
142 143
         ]);
143 144
 
144 145
         return back()->with('success', __('messages.success.update.user'));

+ 3
- 2
public/js/resources_js_pages_user_Edit_vue.js Zobrazit soubor

@@ -1281,7 +1281,8 @@ function render(_ctx, _cache, $props, $setup, $data, $options) {
1281 1281
             icon: "pi pi-trash",
1282 1282
             "class": "p-button-outlined p-button-danger",
1283 1283
             onClick: $setup.onDeleteUser
1284
-          })) : (0,vue__WEBPACK_IMPORTED_MODULE_0__.createCommentVNode)("v-if", true)]), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createElementVNode)("div", _hoisted_11, [(0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)($setup["AppButtonLink"], {
1284
+          })) : (0,vue__WEBPACK_IMPORTED_MODULE_0__.createCommentVNode)("v-if", true)]), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createElementVNode)("div", _hoisted_11, [$props.user.role_id !== 1 ? ((0,vue__WEBPACK_IMPORTED_MODULE_0__.openBlock)(), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createBlock)($setup["AppButtonLink"], {
1285
+            key: 0,
1285 1286
             label: "Blokir",
1286 1287
             icon: "pi pi-ban",
1287 1288
             method: "delete",
@@ -1289,7 +1290,7 @@ function render(_ctx, _cache, $props, $setup, $data, $options) {
1289 1290
             href: _ctx.route('users.block', $props.user.id)
1290 1291
           }, null, 8
1291 1292
           /* PROPS */
1292
-          , ["href"]), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)(_component_Button, {
1293
+          , ["href"])) : (0,vue__WEBPACK_IMPORTED_MODULE_0__.createCommentVNode)("v-if", true), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)(_component_Button, {
1293 1294
             label: "Simpan",
1294 1295
             "class": "p-button-outlined",
1295 1296
             icon: "pi pi-check",

+ 1
- 1
public/js/vue.js Zobrazit soubor

@@ -58522,7 +58522,7 @@ module.exports = JSON.parse('{"name":"axios","version":"0.21.4","description":"P
58522 58522
 /******/ 		// This function allow to reference async chunks
58523 58523
 /******/ 		__webpack_require__.u = (chunkId) => {
58524 58524
 /******/ 			// return url for filenames based on template
58525
-/******/ 			return "js/" + chunkId + ".js?id=" + {"node_modules_chart_js_auto_auto_esm_js":"10c6b388645ceb22","resources_js_pages_auth_ForgotPassword_vue":"4f09a9089a805f7f","resources_js_pages_auth_Login_vue":"4caaba838e354c98","resources_js_pages_auth_ResetPassword_vue":"4f75d390fc237609","resources_js_pages_auth_VerifyEmail_vue":"45475e95c3a05116","resources_js_pages_error_Index_vue":"643f9e77278b1f20","resources_js_pages_expense_Create_vue":"3614aa3032d8593c","resources_js_pages_expense_Index_vue":"f68260f4a1860735","resources_js_pages_expense_Show_vue":"cc353bb934cfae8f","resources_js_pages_expense_tableHeader_js":"5b2c3a80fb697fff","resources_js_pages_home_Index_vue":"78f7761d4fffecaf","resources_js_pages_member_Create_vue":"ebb1e563595a5111","resources_js_pages_member_Edit_vue":"43cbd86037a27455","resources_js_pages_member_Index_vue":"18489856eb0679a8","resources_js_pages_member_tableHeader_js":"61877f698532418e","resources_js_pages_member_useVehicle_js":"8edc972eb134efdf","resources_js_pages_mutation_Report_vue":"9e9ebbfe3641ca9d","resources_js_pages_mutation_tableHeader_js":"2c25ede9c3d1ff83","resources_js_pages_outtransaction_Show_vue":"4129a9cc1807d39a","resources_js_pages_outtransaction_tableHeader_js":"28e044bd873db9aa","resources_js_pages_parkingfee_Create_vue":"f4f995f481eaa023","resources_js_pages_testtransaction_Create_vue":"d5cde5f99e3597dc","resources_js_pages_testtransaction_TableHeader_js":"98292ce5aeb1234f","resources_js_pages_topup_Create_vue":"f341a80b239f46eb","resources_js_pages_topup_Index_vue":"5aea2ac5186e1103","resources_js_pages_topup_Show_vue":"91cca60aae17c7c2","resources_js_pages_topup_tableHeader_js":"8a585c07bb26d0e7","resources_js_pages_transaction_Create_vue":"0fa019477ee95c22","resources_js_pages_transaction_TableHeader_js":"68379a290810960e","resources_js_pages_typemember_Create_vue":"660ed14fa9dd7394","resources_js_pages_typemember_Edit_vue":"69e93c158cd5a213","resources_js_pages_typemember_Index_vue":"cf02cd744a9cd2dc","resources_js_pages_typemember_tableHeader_js":"02f8a6c57093a7fe","resources_js_pages_typemember_useVehicle_js":"9bcdb75c62376835","resources_js_pages_typevehicle_Create_vue":"11dfe34a454816ab","resources_js_pages_typevehicle_Edit_vue":"9a117548abae6538","resources_js_pages_typevehicle_Index_vue":"304e935125cabdcb","resources_js_pages_typevehicle_tableHeader_js":"9616b18c4a750c3f","resources_js_pages_user_Create_vue":"2be502838dda39bb","resources_js_pages_user_Edit_vue":"6f179d542f11553b","resources_js_pages_user_Index_vue":"b24088c0fd50e44d","resources_js_pages_user_Show_vue":"e64490c1a2064c5d","resources_js_pages_user_tableHeader_js":"78beeea0dcacb81b"}[chunkId] + "";
58525
+/******/ 			return "js/" + chunkId + ".js?id=" + {"node_modules_chart_js_auto_auto_esm_js":"10c6b388645ceb22","resources_js_pages_auth_ForgotPassword_vue":"4f09a9089a805f7f","resources_js_pages_auth_Login_vue":"4caaba838e354c98","resources_js_pages_auth_ResetPassword_vue":"4f75d390fc237609","resources_js_pages_auth_VerifyEmail_vue":"45475e95c3a05116","resources_js_pages_error_Index_vue":"643f9e77278b1f20","resources_js_pages_expense_Create_vue":"3614aa3032d8593c","resources_js_pages_expense_Index_vue":"f68260f4a1860735","resources_js_pages_expense_Show_vue":"cc353bb934cfae8f","resources_js_pages_expense_tableHeader_js":"5b2c3a80fb697fff","resources_js_pages_home_Index_vue":"78f7761d4fffecaf","resources_js_pages_member_Create_vue":"ebb1e563595a5111","resources_js_pages_member_Edit_vue":"43cbd86037a27455","resources_js_pages_member_Index_vue":"18489856eb0679a8","resources_js_pages_member_tableHeader_js":"61877f698532418e","resources_js_pages_member_useVehicle_js":"8edc972eb134efdf","resources_js_pages_mutation_Report_vue":"9e9ebbfe3641ca9d","resources_js_pages_mutation_tableHeader_js":"2c25ede9c3d1ff83","resources_js_pages_outtransaction_Show_vue":"4129a9cc1807d39a","resources_js_pages_outtransaction_tableHeader_js":"28e044bd873db9aa","resources_js_pages_parkingfee_Create_vue":"f4f995f481eaa023","resources_js_pages_testtransaction_Create_vue":"d5cde5f99e3597dc","resources_js_pages_testtransaction_TableHeader_js":"98292ce5aeb1234f","resources_js_pages_topup_Create_vue":"f341a80b239f46eb","resources_js_pages_topup_Index_vue":"5aea2ac5186e1103","resources_js_pages_topup_Show_vue":"91cca60aae17c7c2","resources_js_pages_topup_tableHeader_js":"8a585c07bb26d0e7","resources_js_pages_transaction_Create_vue":"0fa019477ee95c22","resources_js_pages_transaction_TableHeader_js":"68379a290810960e","resources_js_pages_typemember_Create_vue":"660ed14fa9dd7394","resources_js_pages_typemember_Edit_vue":"69e93c158cd5a213","resources_js_pages_typemember_Index_vue":"cf02cd744a9cd2dc","resources_js_pages_typemember_tableHeader_js":"02f8a6c57093a7fe","resources_js_pages_typemember_useVehicle_js":"9bcdb75c62376835","resources_js_pages_typevehicle_Create_vue":"11dfe34a454816ab","resources_js_pages_typevehicle_Edit_vue":"9a117548abae6538","resources_js_pages_typevehicle_Index_vue":"304e935125cabdcb","resources_js_pages_typevehicle_tableHeader_js":"9616b18c4a750c3f","resources_js_pages_user_Create_vue":"2be502838dda39bb","resources_js_pages_user_Edit_vue":"d8ec87a477dcb01b","resources_js_pages_user_Index_vue":"b24088c0fd50e44d","resources_js_pages_user_Show_vue":"e64490c1a2064c5d","resources_js_pages_user_tableHeader_js":"78beeea0dcacb81b"}[chunkId] + "";
58526 58526
 /******/ 		};
58527 58527
 /******/ 	})();
58528 58528
 /******/ 	

+ 1
- 0
resources/js/pages/user/Edit.vue Zobrazit soubor

@@ -115,6 +115,7 @@ const onSubmit = () => {
115 115
                 class="col-12 md:col-6 flex flex-column md:flex-row justify-content-center md:justify-content-end"
116 116
               >
117 117
                 <AppButtonLink
118
+                  v-if="user.role_id !== 1"
118 119
                   label="Blokir"
119 120
                   icon="pi pi-ban"
120 121
                   method="delete"