Skip to content

Commit 27a2c55

Browse files
committed
Issue #2141 has been fixed.
1 parent da780c2 commit 27a2c55

File tree

2 files changed

+46
-39
lines changed

2 files changed

+46
-39
lines changed

packages/Webkul/Admin/src/Resources/lang/en/app.php

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1238,24 +1238,25 @@
12381238
],
12391239

12401240
'create' => [
1241-
'confirm-password' => 'Confirm Password',
1242-
'email' => 'Email',
1243-
'general' => 'General',
1244-
'global' => 'Global',
1245-
'group' => 'Group',
1246-
'individual' => 'Individual',
1247-
'name' => 'Name',
1248-
'password' => 'Password',
1249-
'permission' => 'Permission',
1250-
'role' => 'Role',
1251-
'save-btn' => 'Save User',
1252-
'status' => 'Status',
1253-
'title' => 'Create User',
1254-
'view-permission' => 'View Permission',
1241+
'confirm-password' => 'Confirm Password',
1242+
'email' => 'Email',
1243+
'general' => 'General',
1244+
'global' => 'Global',
1245+
'group' => 'Group',
1246+
'individual' => 'Individual',
1247+
'name' => 'Name',
1248+
'password' => 'Password',
1249+
'permission' => 'Permission',
1250+
'role' => 'Role',
1251+
'save-btn' => 'Save User',
1252+
'status' => 'Status',
1253+
'title' => 'Create User',
1254+
'view-permission' => 'View Permission',
1255+
'select-at-lest-one-group' => 'Select at least one group',
12551256
],
12561257

12571258
'edit' => [
1258-
'title' => 'Edit User',
1259+
'title' => 'Edit User',
12591260
],
12601261
],
12611262
],

packages/Webkul/Admin/src/Resources/views/settings/users/index.blade.php

Lines changed: 30 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -366,6 +366,7 @@ class="cursor-pointer rounded-md p-1.5 text-2xl transition-all hover:bg-gray-200
366366
name="view_permission"
367367
rules="required"
368368
v-model="user.view_permission"
369+
value="global"
369370
:label="trans('admin::app.settings.users.index.create.view-permission')"
370371
>
371372
<!-- Default Option -->
@@ -390,36 +391,39 @@ class="cursor-pointer rounded-md p-1.5 text-2xl transition-all hover:bg-gray-200
390391
391392
{!! view_render_event('admin.settings.users.index.form.role_id.before') !!}
392393
393-
<!-- Group -->
394-
<x-admin::form.control-group>
395-
<x-admin::form.control-group.label>
396-
@lang('admin::app.settings.users.index.create.group')
397-
</x-admin::form.control-group.label>
394+
<template v-if="user.view_permission === 'group'">
395+
<!-- Group -->
396+
<x-admin::form.control-group>
397+
<x-admin::form.control-group.label class="required">
398+
@lang('admin::app.settings.users.index.create.group')
399+
</x-admin::form.control-group.label>
398400
399-
<v-field
400-
name="groups[]"
401-
label="@lang('admin::app.settings.users.index.create.group')"
402-
multiple
403-
v-model="user.groups"
404-
>
405-
<select
401+
<v-field
406402
name="groups[]"
407-
class="flex min-h-[39px] w-full rounded-md border px-3 py-2 text-sm text-gray-600 transition-all hover:border-gray-400 focus:border-gray-400 dark:border-gray-800 dark:bg-gray-900 dark:text-gray-300 dark:hover:border-gray-400 dark:focus:border-gray-400"
408-
:class="[errors['groups[]'] ? 'border !border-red-600 hover:border-red-600' : '']"
403+
label="@lang('admin::app.settings.users.index.create.group')"
409404
multiple
410405
v-model="user.groups"
406+
rules="required"
411407
>
412-
<option
413-
v-for="group in groups"
414-
:value="group.id"
415-
:text="group.name"
408+
<select
409+
name="groups[]"
410+
class="flex min-h-[39px] w-full rounded-md border px-3 py-2 text-sm text-gray-600 transition-all hover:border-gray-400 focus:border-gray-400 dark:border-gray-800 dark:bg-gray-900 dark:text-gray-300 dark:hover:border-gray-400 dark:focus:border-gray-400"
411+
:class="[errors['groups[]'] ? 'border !border-red-600 hover:border-red-600' : '']"
412+
multiple
413+
v-model="user.groups"
416414
>
417-
</option>
418-
</select>
419-
</v-field>
415+
<option
416+
v-for="group in groups"
417+
:value="group.id"
418+
:text="group.name"
419+
>
420+
</option>
421+
</select>
422+
</v-field>
420423
421-
<x-admin::form.control-group.error name="groups[]" />
422-
</x-admin::form.control-group>
424+
<x-admin::form.control-group.error name="groups[]" />
425+
</x-admin::form.control-group>
426+
</template>
423427
424428
{!! view_render_event('admin.settings.users.index.form.role_id.after') !!}
425429
@@ -483,7 +487,9 @@ class="primary-button justify-center"
483487
484488
groups: @json($groups),
485489
486-
user: {},
490+
user: {
491+
view_permission: 'global',
492+
},
487493
};
488494
},
489495

0 commit comments

Comments
 (0)