more

discourse · Nov 8, 2024 · be7751f · be7751f
1 parent 588052f
commit be7751f
Show file tree

Hide file tree

Showing 6 changed files with 163 additions and 64 deletions.
diff --git a/assets/javascripts/discourse/components/discourse-post-event/status.gjs b/assets/javascripts/discourse/components/discourse-post-event/status.gjs
@@ -12,10 +12,6 @@ export default class DiscoursePostEventStatus extends Component {
   @service discoursePostEventApi;
   @service siteSettings;
 
-  get watchingInviteeStatus() {
-    return this.args.event.watchingInvitee?.status;
-  }
-
   get eventButtons() {
     return this.siteSettings.event_participation_buttons.split("|");
   }
@@ -36,6 +32,10 @@ export default class DiscoursePostEventStatus extends Component {
     return this.args.event.watchingInvitee && this.args.event.isPublic;
   }
 
+  get watchingInviteeStatus() {
+    return this.args.event.watchingInvitee?.status;
+  }
+
   @action
   async leaveEvent() {
     try {
@@ -107,9 +107,9 @@ export default class DiscoursePostEventStatus extends Component {
   }
 
   <template>
-    <div
+    <section
       class={{concatClass
-        "event-status"
+        "event__section event-actions event-status"
         (if
           this.watchingInviteeStatus
           (concat "status-" this.watchingInviteeStatus)
@@ -177,6 +177,6 @@ export default class DiscoursePostEventStatus extends Component {
           {{/unless}}
         {{/if}}
       </PluginOutlet>
-    </div>
+    </section>
   </template>
 }
diff --git a/assets/javascripts/discourse/components/modal/post-event-builder.hbs b/assets/javascripts/discourse/components/modal/post-event-builder.hbs
@@ -123,7 +123,7 @@
           <GroupSelector
             @fullWidthWrap={{true}}
             @groupFinder={{this.groupFinder}}
-            @groupNames={{@model.event.raw_invitees}}
+            @groupNames={{@model.event.rawInvitees}}
             @onChangeCallback={{this.setRawInvitees}}
             @placeholderKey="topic.invite_private.group_name"
           />
@@ -232,7 +232,7 @@
               <Input
                 class="custom-field-input"
                 @value={{readonly
-                  (get @model.event.custom_fields allowedCustomField)
+                  (get @model.event.customFields allowedCustomField)
                 }}
                 placeholder={{i18n
                   "discourse_post_event.builder_modal.custom_fields.placeholder"

diff --git a/assets/javascripts/discourse/components/modal/post-event-builder.js b/assets/javascripts/discourse/components/modal/post-event-builder.js
@@ -146,7 +146,7 @@ export default class PostEventBuilder extends Component {
 
   @action
   setCustomField(field, e) {
-    this.event[field] = e.target.value;
+    this.event.customFields[field] = e.target.value;
   }
 
   @action

diff --git a/assets/javascripts/discourse/models/discourse-post-event-event.js b/assets/javascripts/discourse/models/discourse-post-event-event.js
@@ -26,6 +26,7 @@ export default class DiscoursePostEventEvent {
   @tracked rawInvitees;
   @tracked url;
   @tracked timezone;
+  @tracked status;
   @tracked post;
   @tracked minimal;
   @tracked canUpdateAttendance;