Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[7.x] Add Publish State permission #553

Merged
merged 15 commits into from
Jul 12, 2024
Merged

[7.x] Add Publish State permission #553

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
1850db0
add publish state permission
edalzell Jul 9, 2024
c680906
wip
edalzell Jul 9, 2024
49bbd76
make it conditional
edalzell Jul 10, 2024
1a0e3c4
make it a method
edalzell Jul 10, 2024
79882c1
add updater script
edalzell Jul 10, 2024
57cd9c0
only add if resource uses publishing
edalzell Jul 10, 2024
ae63309
Merge branch '7.x' into pr/553
duncanmcclean Jul 12, 2024
354742d
undo class order changes
duncanmcclean Jul 12, 2024
358a23b
drop `makePermission` method
duncanmcclean Jul 12, 2024
066ef6b
it's gonna be a minor release
duncanmcclean Jul 12, 2024
938c337
rename upgrade script
duncanmcclean Jul 12, 2024
ccebc29
simplify
duncanmcclean Jul 12, 2024
c08fa82
add tests for the update script
duncanmcclean Jul 12, 2024
8452c21
no longer needed
duncanmcclean Jul 12, 2024
527bf6a
🍺
duncanmcclean Jul 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions resources/js/components/Publish/PublishForm.vue
View file
Open in desktop
edalzell marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@
v-if="revisionsEnabled && !isCreating"
class="rtl:mr-4 ltr:ml-4 btn-primary flex items-center"
:disabled="!canPublish"
@click="confirmingPublish = true">
<span>{{ __('Publish') }}…</span>
</button>
@click="confirmingPublish = true"
v-text="this.canManagePublishState ? __('Publish') : __('Create Revision')"
/>
</div>

<slot name="action-buttons-right" />
Expand Down Expand Up @@ -103,7 +103,7 @@
class="flex items-center justify-between px-4 py-2"
:class="{ 'border-t dark:border-dark-900': resourceHasRoutes && permalink }"
>
<label v-text="__('Published')" class="publish-field-label font-medium" />
<label v-text="__('Published')" class="font-medium publish-field-label" />
<toggle-input :value="published" :read-only="!canManagePublishState" @input="setFieldValue(resource.published_column, $event)" />
</div>
</div>
Expand Down Expand Up @@ -158,8 +158,8 @@
class="rtl:mr-4 ltr:ml-4 btn-primary flex items-center"
:disabled="!canPublish"
@click="confirmingPublish = true">
<span v-text="__('Publish')" />
<svg-icon name="micro/chevron-down-xs" class="rtl:mr-2 ltr:ml-2 w-2" />
<span v-text="this.canManagePublishState ? __('Publish') : __('Create Revision')" />
edalzell marked this conversation as resolved.
Show resolved Hide resolved
<svg-icon name="micro/chevron-down-xs" class="w-2 rtl:mr-2 ltr:ml-2" />
</button>
</template>
</publish-container>
Expand All @@ -181,8 +181,8 @@
class="rtl:mr-2 ltr:ml-2 btn btn-lg justify-center btn-primary flex items-center w-1/2"
:disabled="!canPublish"
@click="confirmingPublish = true">
<span v-text="__('Publish')" />
<svg-icon name="micro/chevron-down-xs" class="rtl:mr-2 ltr:ml-2 w-2" />
<span v-text="this.canManagePublishState ? __('Publish') : __('Create Revision')" />
<svg-icon name="micro/chevron-down-xs" class="w-2 rtl:mr-2 ltr:ml-2" />
</button>
</div>

Expand Down
4 changes: 2 additions & 2 deletions src/Http/Controllers/CP/ResourceController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public function create(CreateRequest $request, Resource $resource)
])->all(),
'meta' => $fields->meta(),
'resourceHasRoutes' => $resource->hasRouting(),
'canManagePublishState' => User::current()->can('edit', $resource),
'canManagePublishState' => User::current()->can('publish', $resource),
];

if ($request->wantsJson()) {
Expand Down Expand Up @@ -174,7 +174,7 @@ public function edit(EditRequest $request, Resource $resource, $model)
'title' => $model->{$resource->titleField()},
'edit_url' => $request->url(),
],
'canManagePublishState' => User::current()->can('edit', $resource),
'canManagePublishState' => User::current()->can('publish', $resource),
'itemActions' => Action::for($model, ['resource' => $resource->handle(), 'view' => 'form']),
'revisionsEnabled' => $resource->revisionsEnabled(),
];
Expand Down
3 changes: 3 additions & 0 deletions src/ServiceProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,9 @@ protected function registerPermissions(): self
Permission::make("create {$resource->handle()}")
->label($this->permissionLabel('create', $resource)),

Permission::make("publish {$resource->handle()}")
edalzell marked this conversation as resolved.
Show resolved Hide resolved
->label("Manage {$resource->handle()} Publish State"),

Permission::make("delete {$resource->handle()}")
->label($this->permissionLabel('delete', $resource)),
]),
Expand Down
Loading