Skip to content

Commit 2e07853

Browse files
committed
acl.
1 parent 89343b1 commit 2e07853

File tree

5 files changed

+71
-57
lines changed

5 files changed

+71
-57
lines changed

packages/Webkul/Admin/src/Config/acl.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -408,22 +408,22 @@
408408
'sort' => 3,
409409
],
410410
[
411-
'key' => 'settings.automation.webhook',
411+
'key' => 'settings.automation.webhooks',
412412
'name' => 'admin::app.acl.webhook',
413413
'route' => 'admin.settings.webhooks.index',
414414
'sort' => 1,
415415
], [
416-
'key' => 'settings.automation.webhook.create',
416+
'key' => 'settings.automation.webhooks.create',
417417
'name' => 'admin::app.acl.create',
418418
'route' => ['admin.settings.webhooks.create', 'admin.settings.webhooks.store'],
419419
'sort' => 1,
420420
], [
421-
'key' => 'settings.automation.webhook.edit',
421+
'key' => 'settings.automation.webhooks.edit',
422422
'name' => 'admin::app.acl.edit',
423423
'route' => ['admin.settings.webhooks.edit', 'admin.settings.webhooks.update'],
424424
'sort' => 2,
425425
], [
426-
'key' => 'settings.automation.webhook.delete',
426+
'key' => 'settings.automation.webhooks.delete',
427427
'name' => 'admin::app.acl.delete',
428428
'route' => 'admin.settings.webhooks.delete',
429429
'sort' => 3,

packages/Webkul/Admin/src/DataGrids/Settings/TagDataGrid.php

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -98,25 +98,29 @@ public function prepareColumns(): void
9898
*/
9999
public function prepareActions(): void
100100
{
101-
$this->addAction([
102-
'index' => 'edit',
103-
'icon' => 'icon-edit',
104-
'title' => trans('admin::app.settings.tags.index.datagrid.edit'),
105-
'method' => 'GET',
106-
'url' => function ($row) {
107-
return route('admin.settings.tags.edit', $row->id);
108-
},
109-
]);
101+
if (bouncer()->hasPermission('settings.other_settings.tags.edit')) {
102+
$this->addAction([
103+
'index' => 'edit',
104+
'icon' => 'icon-edit',
105+
'title' => trans('admin::app.settings.tags.index.datagrid.edit'),
106+
'method' => 'GET',
107+
'url' => function ($row) {
108+
return route('admin.settings.tags.edit', $row->id);
109+
},
110+
]);
111+
}
110112

111-
$this->addAction([
112-
'index' => 'delete',
113-
'icon' => 'icon-delete',
114-
'title' => trans('admin::app.settings.tags.index.datagrid.delete'),
115-
'method' => 'DELETE',
116-
'url' => function ($row) {
117-
return route('admin.settings.tags.delete', $row->id);
118-
},
119-
]);
113+
if (bouncer()->hasPermission('settings.other_settings.tags.delete')) {
114+
$this->addAction([
115+
'index' => 'delete',
116+
'icon' => 'icon-delete',
117+
'title' => trans('admin::app.settings.tags.index.datagrid.delete'),
118+
'method' => 'DELETE',
119+
'url' => function ($row) {
120+
return route('admin.settings.tags.delete', $row->id);
121+
},
122+
]);
123+
}
120124
}
121125

122126
/**

packages/Webkul/Admin/src/DataGrids/Settings/WebhookDataGrid.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public function prepareColumns(): void
7373
*/
7474
public function prepareActions(): void
7575
{
76-
if (bouncer()->hasPermission('admin.settings.webhooks.edit')) {
76+
if (bouncer()->hasPermission('settings.automation.webhooks.edit')) {
7777
$this->addAction([
7878
'index' => 'edit',
7979
'icon' => 'icon-edit',
@@ -83,7 +83,7 @@ public function prepareActions(): void
8383
]);
8484
}
8585

86-
if (bouncer()->hasPermission('admin.settings.webhooks.delete')) {
86+
if (bouncer()->hasPermission('settings.automation.webhooks.delete')) {
8787
$this->addAction([
8888
'index' => 'delete',
8989
'icon' => 'icon-delete',

packages/Webkul/Admin/src/Resources/views/settings/web-forms/index.blade.php

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,14 @@
1919
<div class="flex items-center gap-x-2.5">
2020
<!-- Create button for person -->
2121
<div class="flex items-center gap-x-2.5">
22-
<button
23-
type="button"
24-
class="primary-button"
25-
>
26-
@lang('admin::app.settings.webforms.index.create-btn')
27-
</button>
22+
@if (bouncer()->hasPermission('admin.settings.web_forms.create'))
23+
<button
24+
type="button"
25+
class="primary-button"
26+
>
27+
@lang('admin::app.settings.webforms.index.create-btn')
28+
</button>
29+
@endif
2830
</div>
2931
</div>
3032
</div>
@@ -55,12 +57,14 @@ class="primary-button"
5557
<div class="flex items-center gap-x-2.5">
5658
{!! view_render_event('krayin.admin.settings.web_forms.index.create_button.before') !!}
5759
58-
<a
59-
href="{{ route('admin.settings.web_forms.create') }}"
60-
class="primary-button"
61-
>
62-
@lang('admin::app.settings.webforms.index.create-btn')
63-
</a>
60+
@if (bouncer()->hasPermission('admin.settings.web_forms.create'))
61+
<a
62+
href="{{ route('admin.settings.web_forms.create') }}"
63+
class="primary-button"
64+
>
65+
@lang('admin::app.settings.webforms.index.create-btn')
66+
</a>
67+
@endif
6468
6569
{!! view_render_event('krayin.admin.settings.web_forms.index.create_button.after') !!}
6670
</div>

packages/Webkul/WebForm/src/DataGrids/WebFormDataGrid.php

Lines changed: 27 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -52,28 +52,34 @@ public function prepareColumns(): void
5252
*/
5353
public function prepareActions(): void
5454
{
55-
$this->addAction([
56-
'index' => 'view',
57-
'icon' => 'icon-eye',
58-
'title' => trans('admin::app.settings.webforms.index.datagrid.view'),
59-
'method' => 'GET',
60-
'url' => fn ($row) => route('admin.settings.web_forms.view', $row->id),
61-
]);
55+
if (bouncer()->hasPermission('settings.other_settings.web_forms.view')) {
56+
$this->addAction([
57+
'index' => 'view',
58+
'icon' => 'icon-eye',
59+
'title' => trans('admin::app.settings.webforms.index.datagrid.view'),
60+
'method' => 'GET',
61+
'url' => fn ($row) => route('admin.settings.web_forms.view', $row->id),
62+
]);
63+
}
6264

63-
$this->addAction([
64-
'index' => 'edit',
65-
'icon' => 'icon-edit',
66-
'title' => trans('admin::app.settings.webforms.index.datagrid.edit'),
67-
'method' => 'GET',
68-
'url' => fn ($row) => route('admin.settings.web_forms.edit', $row->id),
69-
]);
65+
if (bouncer()->hasPermission('settings.other_settings.web_forms.edit')) {
66+
$this->addAction([
67+
'index' => 'edit',
68+
'icon' => 'icon-edit',
69+
'title' => trans('admin::app.settings.webforms.index.datagrid.edit'),
70+
'method' => 'GET',
71+
'url' => fn ($row) => route('admin.settings.web_forms.edit', $row->id),
72+
]);
73+
}
7074

71-
$this->addAction([
72-
'index' => 'delete',
73-
'icon' => 'icon-delete',
74-
'title' => trans('admin::app.settings.webforms.index.datagrid.delete'),
75-
'method' => 'DELETE',
76-
'url' => fn ($row) => route('admin.settings.web_forms.delete', $row->id),
77-
]);
75+
if (bouncer()->hasPermission('settings.other_settings.web_forms.delete')) {
76+
$this->addAction([
77+
'index' => 'delete',
78+
'icon' => 'icon-delete',
79+
'title' => trans('admin::app.settings.webforms.index.datagrid.delete'),
80+
'method' => 'DELETE',
81+
'url' => fn ($row) => route('admin.settings.web_forms.delete', $row->id),
82+
]);
83+
}
7884
}
7985
}

0 commit comments

Comments
 (0)