Merge branch 'release/v1.5.3'

Connected-Places · Aug 22, 2022 · a9488fb · a9488fb
2 parents 388cafc + cee89a1
commit a9488fb
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 29 deletions.
diff --git a/src/components/Ck/CkLocationInput.vue b/src/components/Ck/CkLocationInput.vue
@@ -38,6 +38,7 @@
         :country.sync="form.country"
         :has_induction_loop.sync="form.has_induction_loop"
         :has_wheelchair_access.sync="form.has_wheelchair_access"
+        :has_accessible_toilet.sync="form.has_accessible_toilet"
         @update:image_file_id="form.image_file_id = $event"
         @clear="form.$errors.clear($event)"
       />
@@ -107,6 +108,10 @@ export default {
     has_wheelchair_access: {
       required: false,
       type: Boolean
+    },
+    has_accessible_toilet: {
+      required: false,
+      type: Boolean
     }
   },
 
@@ -126,6 +131,7 @@ export default {
         accessibility_info: "",
         has_wheelchair_access: false,
         has_induction_loop: false,
+        has_accessible_toilet: false,
         image_file_id: null
       }),
       countries: [

diff --git a/src/views/events/Create.vue b/src/views/events/Create.vue
@@ -8,32 +8,31 @@
         <gov-grid-column width="full">
           <gov-heading size="xl">Events</gov-heading>
 
-          <template v-if="!auth.isGlobalAdmin">
-            <gov-body class="govuk-!-font-weight-bold">
-              Please review the process below on how to create an event.
-            </gov-body>
-
-            <gov-list bullet>
-              <li>To create an event, fill in the form below.</li>
-              <li>
-                The event won't be visible until an admin has reviewed it.
-              </li>
-              <li>
-                If there are any issues upon review, an admin will get directly
-                in touch with you.
-              </li>
-            </gov-list>
-
-            <div v-if="updateRequestCreated">
-              <gov-heading size="m" tag="h3">Create event request</gov-heading>
-              <gov-body>{{ updateRequestMessage }}</gov-body>
-              <gov-back-link :to="{ name: 'events-index' }"
-                >Back to events</gov-back-link
-              >
-            </div>
+          <template v-if="updateRequestCreated">
+            <gov-heading size="m" tag="h3">Create event request</gov-heading>
+            <gov-body>{{ updateRequestMessage }}</gov-body>
+            <gov-back-link :to="{ name: 'events-index' }"
+              >Back to events</gov-back-link
+            >
           </template>
 
-          <template v-if="!updateRequestCreated">
+          <template v-else>
+            <div v-if="!auth.isGlobalAdmin">
+              <gov-body class="govuk-!-font-weight-bold">
+                Please review the process below on how to create an event.
+              </gov-body>
+
+              <gov-list bullet>
+                <li>To create an event, fill in the form below.</li>
+                <li>
+                  The event won't be visible until an admin has reviewed it.
+                </li>
+                <li>
+                  If there are any issues upon review, an admin will get
+                  directly in touch with you.
+                </li>
+              </gov-list>
+            </div>
             <gov-heading size="m">Add event</gov-heading>
             <gov-body
               >The events will appear on their own page will be discoverable and
@@ -77,9 +76,9 @@
                 :is_virtual.sync="form.is_virtual"
                 :homepage.sync="form.homepage"
                 :organisations="organisations"
-                @update:organisation_id="form.organisation_id = $event"
-                @update:location_id="form.location_id = $event"
-                @update:image_file_id="form.image_file_id = $event"
+                :organisation_id.sync="form.organisation_id"
+                :location_id.sync="form.location_id"
+                :image_file_id.sync="form.image_file_id"
                 @clear="form.$errors.clear($event)"
               />
               <taxonomies-tab

diff --git a/src/views/events/show/EventDetails.vue b/src/views/events/show/EventDetails.vue
@@ -148,7 +148,6 @@ export default {
       const startDate = new Date(
         `${this.event.start_date} ${this.event.start_time}`
       );
-      console.debug("Start Date:", startDate);
       return `${String(startDate.getDate()).padStart(2, "0")}/${String(
         startDate.getMonth() + 1
       ).padStart(2, "0")}/${startDate.getFullYear()} ${String(
@@ -157,7 +156,6 @@ export default {
     },
     endDateTimeStr() {
       const endDate = new Date(`${this.event.end_date} ${this.event.end_time}`);
-      console.debug("End Date:", endDate);
       return `${String(endDate.getDate()).padStart(2, "0")}/${String(
         endDate.getMonth() + 1
       ).padStart(2, "0")}/${endDate.getFullYear()} ${String(