Skip to content

Commit

Permalink
acl.
Browse files Browse the repository at this point in the history
  • Loading branch information
@suraj-webkul
suraj-webkul committed Aug 20, 2024
1 parent 7a30368 commit d1a8cdb
Show file tree
Hide file tree
Showing 5 changed files with 71 additions and 57 deletions.
8 changes: 4 additions & 4 deletions packages/Webkul/Admin/src/Config/acl.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -408,22 +408,22 @@
'sort' => 3,
],
[
'key' => 'settings.automation.webhook',
'key' => 'settings.automation.webhooks',
'name' => 'admin::app.acl.webhook',
'route' => 'admin.settings.webhooks.index',
'sort' => 1,
], [
'key' => 'settings.automation.webhook.create',
'key' => 'settings.automation.webhooks.create',
'name' => 'admin::app.acl.create',
'route' => ['admin.settings.webhooks.create', 'admin.settings.webhooks.store'],
'sort' => 1,
], [
'key' => 'settings.automation.webhook.edit',
'key' => 'settings.automation.webhooks.edit',
'name' => 'admin::app.acl.edit',
'route' => ['admin.settings.webhooks.edit', 'admin.settings.webhooks.update'],
'sort' => 2,
], [
'key' => 'settings.automation.webhook.delete',
'key' => 'settings.automation.webhooks.delete',
'name' => 'admin::app.acl.delete',
'route' => 'admin.settings.webhooks.delete',
'sort' => 3,
Expand Down
40 changes: 22 additions & 18 deletions packages/Webkul/Admin/src/DataGrids/Settings/TagDataGrid.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,25 +98,29 @@ public function prepareColumns(): void
*/
public function prepareActions(): void
{
$this->addAction([
'index' => 'edit',
'icon' => 'icon-edit',
'title' => trans('admin::app.settings.tags.index.datagrid.edit'),
'method' => 'GET',
'url' => function ($row) {
return route('admin.settings.tags.edit', $row->id);
},
]);
if (bouncer()->hasPermission('settings.other_settings.tags.edit')) {
$this->addAction([
'index' => 'edit',
'icon' => 'icon-edit',
'title' => trans('admin::app.settings.tags.index.datagrid.edit'),
'method' => 'GET',
'url' => function ($row) {
return route('admin.settings.tags.edit', $row->id);
},
]);
}

$this->addAction([
'index' => 'delete',
'icon' => 'icon-delete',
'title' => trans('admin::app.settings.tags.index.datagrid.delete'),
'method' => 'DELETE',
'url' => function ($row) {
return route('admin.settings.tags.delete', $row->id);
},
]);
if (bouncer()->hasPermission('settings.other_settings.tags.delete')) {
$this->addAction([
'index' => 'delete',
'icon' => 'icon-delete',
'title' => trans('admin::app.settings.tags.index.datagrid.delete'),
'method' => 'DELETE',
'url' => function ($row) {
return route('admin.settings.tags.delete', $row->id);
},
]);
}
}

/**
Expand Down
4 changes: 2 additions & 2 deletions packages/Webkul/Admin/src/DataGrids/Settings/WebhookDataGrid.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ public function prepareColumns(): void
*/
public function prepareActions(): void
{
if (bouncer()->hasPermission('admin.settings.webhooks.edit')) {
if (bouncer()->hasPermission('settings.automation.webhooks.edit')) {
$this->addAction([
'index' => 'edit',
'icon' => 'icon-edit',
Expand All @@ -83,7 +83,7 @@ public function prepareActions(): void
]);
}

if (bouncer()->hasPermission('admin.settings.webhooks.delete')) {
if (bouncer()->hasPermission('settings.automation.webhooks.delete')) {
$this->addAction([
'index' => 'delete',
'icon' => 'icon-delete',
Expand Down
28 changes: 16 additions & 12 deletions packages/Webkul/Admin/src/Resources/views/settings/web-forms/index.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,14 @@
<div class="flex items-center gap-x-2.5">
<!-- Create button for person -->
<div class="flex items-center gap-x-2.5">
<button
type="button"
class="primary-button"
>
@lang('admin::app.settings.webforms.index.create-btn')
</button>
@if (bouncer()->hasPermission('admin.settings.web_forms.create'))
<button
type="button"
class="primary-button"
>
@lang('admin::app.settings.webforms.index.create-btn')
</button>
@endif
</div>
</div>
</div>
Expand Down Expand Up @@ -55,12 +57,14 @@ class="primary-button"
<div class="flex items-center gap-x-2.5">
{!! view_render_event('krayin.admin.settings.web_forms.index.create_button.before') !!}
<a
href="{{ route('admin.settings.web_forms.create') }}"
class="primary-button"
>
@lang('admin::app.settings.webforms.index.create-btn')
</a>
@if (bouncer()->hasPermission('admin.settings.web_forms.create'))
<a
href="{{ route('admin.settings.web_forms.create') }}"
class="primary-button"
>
@lang('admin::app.settings.webforms.index.create-btn')
</a>
@endif
{!! view_render_event('krayin.admin.settings.web_forms.index.create_button.after') !!}
</div>
Expand Down
48 changes: 27 additions & 21 deletions packages/Webkul/WebForm/src/DataGrids/WebFormDataGrid.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,28 +52,34 @@ public function prepareColumns(): void
*/
public function prepareActions(): void
{
$this->addAction([
'index' => 'view',
'icon' => 'icon-eye',
'title' => trans('admin::app.settings.webforms.index.datagrid.view'),
'method' => 'GET',
'url' => fn ($row) => route('admin.settings.web_forms.view', $row->id),
]);
if (bouncer()->hasPermission('settings.other_settings.web_forms.view')) {
$this->addAction([
'index' => 'view',
'icon' => 'icon-eye',
'title' => trans('admin::app.settings.webforms.index.datagrid.view'),
'method' => 'GET',
'url' => fn ($row) => route('admin.settings.web_forms.view', $row->id),
]);
}

$this->addAction([
'index' => 'edit',
'icon' => 'icon-edit',
'title' => trans('admin::app.settings.webforms.index.datagrid.edit'),
'method' => 'GET',
'url' => fn ($row) => route('admin.settings.web_forms.edit', $row->id),
]);
if (bouncer()->hasPermission('settings.other_settings.web_forms.edit')) {
$this->addAction([
'index' => 'edit',
'icon' => 'icon-edit',
'title' => trans('admin::app.settings.webforms.index.datagrid.edit'),
'method' => 'GET',
'url' => fn ($row) => route('admin.settings.web_forms.edit', $row->id),
]);
}

$this->addAction([
'index' => 'delete',
'icon' => 'icon-delete',
'title' => trans('admin::app.settings.webforms.index.datagrid.delete'),
'method' => 'DELETE',
'url' => fn ($row) => route('admin.settings.web_forms.delete', $row->id),
]);
if (bouncer()->hasPermission('settings.other_settings.web_forms.delete')) {
$this->addAction([
'index' => 'delete',
'icon' => 'icon-delete',
'title' => trans('admin::app.settings.webforms.index.datagrid.delete'),
'method' => 'DELETE',
'url' => fn ($row) => route('admin.settings.web_forms.delete', $row->id),
]);
}
}
}

0 comments on commit d1a8cdb

Please sign in to comment.