Merge branch 'v1.24.1'

src/classes/Auth.js

@@ -419,7 +419,7 @@ class Auth {
  return true;
  }
  if (type === "page") {
- return this.isContentAdmin;
+ return this.isSuperAdmin;
  }
  if (type === "user") {
  return (

src/views/pages/Edit.vue

@@ -33,15 +33,6 @@
  }}</gov-button>
 
  <ck-submit-error v-if="form.$errors.any()" />
-
- <gov-section-break size="l" />
-
- <ck-delete-button
- v-if="canDelete"
- resource="page"
- :endpoint="`/pages/${this.page.id}`"
- @deleted="onDelete"
- />
  </gov-main-wrapper>
  </template>
  </gov-width-container>
@@ -161,11 +152,6 @@ export default {
  }
  this.$router.push(next);
  },
- onDelete() {
- this.$router.push({
- name: "pages-index",
- });
- },
  },
  created() {
  this.fetchPage();

src/views/pages/List.vue

@@ -9,6 +9,10 @@
  >page {{ updatedPage.title }} has been updated</gov-inset-text
  >
 
+ <gov-inset-text v-if="orderChangedMessage">{{
+ orderChangedMessage
+ }}</gov-inset-text>
+
  <gov-grid-row>
  <gov-grid-column width="two-thirds">
  <ck-table-filters @search="onSearch">
@@ -138,6 +142,7 @@ export default {
  { value: "landing", text: "Landing page" },
  ],
  updated: false,
+ orderChangedMessage: null,
  };
  },
  computed: {
@@ -184,19 +189,35 @@ export default {
  this.loading = false;
  },
  async onMoveUp(page) {
+ this.orderChangedMessage = null;
+ const orderWas = page.order;
  page.order--;
  await http.put(`/pages/${page.id}`, {
  id: page.id,
  order: page.order,
  });
+ if (!this.auth.isSuperAdmin) {
+ this.orderChangedMessage = this.orderUpdateRequestMessage(
+ orderWas,
+ page
+ );
+ }
  this.fetchPages();
  },
  async onMoveDown(page) {
+ this.orderChangedMessage = null;
+ const orderWas = page.order;
  page.order++;
  await http.put(`/pages/${page.id}`, {
  id: page.id,
  order: page.order,
  });
+ if (!this.auth.isSuperAdmin) {
+ this.orderChangedMessage = this.orderUpdateRequestMessage(
+ orderWas,
+ page
+ );
+ }
  this.fetchPages();
  },
  async onSearch() {
@@ -227,6 +248,9 @@ export default {
 
  return parsed;
  },
+ orderUpdateRequestMessage(orderWas, page) {
+ return `An update request has been created to change the order of page ${page.title} from ${orderWas} to ${page.order}`;
+ },
  },
  created() {
  this.updated = this.$route.query.updated || false;

src/views/pages/Show.vue

@@ -123,6 +123,11 @@ export default {
 
  this.loading = false;
  },
+ onDelete() {
+ this.$router.push({
+ name: "pages-index",
+ });
+ },
  },
 
  created() {

src/views/update-requests/show/PageDetails.vue

@@ -56,6 +56,12 @@
  <gov-table-cell>{{ page.enabled | status }}</gov-table-cell>
  </gov-table-row>
 
+ <gov-table-row v-if="page.hasOwnProperty('order')">
+ <gov-table-header top scope="row">Order</gov-table-header>
+ <gov-table-cell v-if="original">{{ original.order }}</gov-table-cell>
+ <gov-table-cell>{{ page.order }}</gov-table-cell>
+ </gov-table-row>
+
  <gov-table-row v-if="page.hasOwnProperty('content')">
  <gov-table-header top scope="row">Content</gov-table-header>
  <gov-table-cell v-if="original">