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

Jump to bottom

Check ‘manage publish state’ permission in publish actions #7168

Merged
merged 1 commit into from Jan 18, 2023
Merged

Check ‘manage publish state’ permission in publish actions #7168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
21 changes: 12 additions & 9 deletions resources/js/components/entries/PublishActions.vue
View file
Open in desktop
Expand Up @@ -76,11 +76,12 @@ export default {
collection: String,
reference: String,
publishContainer: String,
canManagePublishState: Boolean,
},

data() {
return {
action: 'publish',
action: this.canManagePublishState ? 'publish' : 'revision',
revisionMessage: null,
saving: false,
}
Expand All @@ -89,17 +90,19 @@ export default {
computed: {

options() {
let options = [
{ value: 'publish', label: __('Publish Now'), },
];
const options = [];

if (this.published) {
options.push({ value: 'unpublish', label: __('Unpublish') });
if (this.canManagePublishState) {
options.push({ value: 'publish', label: __('Publish Now') });

if (this.published) {
options.push({ value: 'unpublish', label: __('Unpublish') });
}
}

return options.concat([
{ value: 'revision', label: __('Create Revision'), },
]);
options.push({ value: 'revision', label: __('Create Revision') });

return options;
},

actionInfoText() {
Expand Down
1 change: 1 addition & 0 deletions resources/js/components/entries/PublishForm.vue
View file
Open in desktop
Expand Up @@ -248,6 +248,7 @@
:collection="collectionHandle"
:reference="initialReference"
:publish-container="publishContainer"
:can-manage-publish-state="canManagePublishState"
@closed="confirmingPublish = false"
@saving="saving = true"
@saved="publishActionCompleted"
Expand Down
23 changes: 13 additions & 10 deletions resources/js/components/terms/PublishActions.vue
View file
Open in desktop
Expand Up @@ -74,12 +74,13 @@ export default {

props: {
actions: Object,
published: Boolean
published: Boolean,
canManagePublishState: Boolean,
},

data() {
return {
action: 'publish',
action: this.canManagePublishState ? 'publish' : 'revision',
revisionMessage: null,
saving: false,
}
Expand All @@ -88,17 +89,19 @@ export default {
computed: {

options() {
let options = [
{ value: 'publish', label: 'Publish Now', },
];
const options = [];

if (this.published) {
options.push({ value: 'unpublish', label: 'Unpublish' });
if (this.canManagePublishState) {
options.push({ value: 'publish', label: __('Publish Now') });

if (this.published) {
options.push({ value: 'unpublish', label: __('Unpublish') });
}
}

return options.concat([
{ value: 'revision', label: 'Create Revision', },
]);
options.push({ value: 'revision', label: __('Create Revision') });

return options;
},

actionInfoText() {
Expand Down
1 change: 1 addition & 0 deletions resources/js/components/terms/PublishForm.vue
View file
Open in desktop
Expand Up @@ -225,6 +225,7 @@
v-if="confirmingPublish"
:actions="actions"
:published="published"
:can-manage-publish-state="canManagePublishState"
@closed="confirmingPublish = false"
@saving="saving = true"
@saved="publishActionCompleted"
Expand Down