Merge branch 'release/v1.6.2'

Connected-Places · Oct 6, 2022 · c8c2ea2 · c8c2ea2
2 parents a9488fb + c7a1acd
commit c8c2ea2
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 7 deletions.
diff --git a/public/index.html b/public/index.html
@@ -5,6 +5,7 @@
     <title></title>
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="theme-color" />
+    <meta name="robots" />
 
     <link rel="apple-touch-icon" sizes="57x57" href="/assets/images/apple-icon-57x57.png">
     <link rel="apple-touch-icon" sizes="60x60" href="/assets/images/apple-icon-60x60.png">
@@ -22,7 +23,6 @@
     <link rel="manifest" href="/assets/images/manifest.json">
     <meta name="msapplication-TileColor" content="#ffffff">
     <meta name="msapplication-TileImage" content="/assets/images/ms-icon-144x144.png">
-    <meta name="theme-color" content="#ffffff">
 
     <meta property="og:image" content="/assets/images/govuk-opengraph-image.png">
 </head>

diff --git a/src/App.vue b/src/App.vue
@@ -43,7 +43,10 @@ export default {
   computed: {
     headAttributes() {
       return {
-        "meta[name=theme-color]": { content: this.themeColor }
+        "meta[name=theme-color]": {
+          content: this.themeColor
+        },
+        "meta[name=robots]": { content: "noindex" }
       };
     },
     htmlAttributes() {

diff --git a/src/views/organisations/forms/OrganisationForm.vue b/src/views/organisations/forms/OrganisationForm.vue
@@ -10,6 +10,7 @@
     />
 
     <ck-text-input
+      v-if="auth.isGlobalAdmin"
       :value="slug"
       @input="onInput('slug', $event)"
       id="slug"

diff --git a/src/views/services/Import.vue b/src/views/services/Import.vue
@@ -103,6 +103,7 @@ export default {
       fields: {
         index: "Index",
         id: "ID",
+        organisation_id: "Organisation ID",
         name: "Name",
         type: "Type",
         status: "Status",

diff --git a/src/views/services/Show.vue b/src/views/services/Show.vue
@@ -36,12 +36,12 @@
             <router-view :service="service" />
           </gov-tabs>
 
-          <gov-body
-            >Please be certain of the action before deleting a
-            {{ service.type }}</gov-body
-          >
-
           <template v-if="auth.isGlobalAdmin">
+            <gov-body
+              >Please be certain of the action before deleting a
+              {{ service.type }}</gov-body
+            >
+
             <gov-section-break size="l" />
 
             <ck-delete-button

diff --git a/src/views/update-requests/show/OrganisationEventDetails.vue b/src/views/update-requests/show/OrganisationEventDetails.vue
@@ -274,6 +274,7 @@
           </gov-table-cell>
           <gov-table-cell>
             <img
+              v-if="event.id"
               :src="
                 apiUrl(
                   `/organisation-events/${event.id}/image.png?update_request_id=${updateRequestId}`
@@ -282,6 +283,16 @@
               alt="Event image"
               class="ck-logo"
             />
+            <img
+              v-else
+              :src="
+                apiUrl(
+                  `/organisation-events/new/image.png?update_request_id=${updateRequestId}`
+                )
+              "
+              alt="Event image"
+              class="ck-logo"
+            />
           </gov-table-cell>
         </gov-table-row>
       </template>

diff --git a/src/views/update-requests/show/ServiceDetails.vue b/src/views/update-requests/show/ServiceDetails.vue
@@ -445,6 +445,7 @@
           </gov-table-cell>
           <gov-table-cell>
             <img
+              v-if="service.id"
               :src="
                 logoDataUri ||
                   apiUrl(
@@ -454,6 +455,17 @@
               alt="Service logo"
               class="ck-logo"
             />
+            <img
+              v-else
+              :src="
+                logoDataUri ||
+                  apiUrl(
+                    `/services/new/logo.png?update_request_id=${updateRequestId}`
+                  )
+              "
+              alt="Service logo"
+              class="ck-logo"
+            />
           </gov-table-cell>
         </gov-table-row>