feat: Implement a tick box for organizers/admin to override Email

fossasia · Aug 3, 2019 · fa289d5 · fa289d5
1 parent cf1aba3
commit fa289d5
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 2 deletions.
diff --git a/app/controllers/events/view/sessions/create.js b/app/controllers/events/view/sessions/create.js
@@ -6,6 +6,9 @@ export default Controller.extend({
       await this.get('model.session').save();
       if (this.addNewSpeaker) {
         let newSpeaker = this.get('model.speaker');
+        if (newSpeaker.isEmailOverridden) {
+          newSpeaker.set('email', this.authManager.currentUser.email);
+        }
         newSpeaker.save()
           .then(() => {
             newSpeaker.sessions.pushObject(_this.get('model.session'));

diff --git a/app/controllers/events/view/sessions/edit.js b/app/controllers/events/view/sessions/edit.js
@@ -7,6 +7,9 @@ export default Controller.extend({
       let _this = this;
       if (this.addNewSpeaker) {
         let newSpeaker = this.get('model.speaker');
+        if (newSpeaker.isEmailOverridden) {
+          newSpeaker.set('email', this.authManager.currentUser.email);
+        }
         newSpeaker.save()
           .then(() => {
             newSpeaker.sessions.pushObject(_this.get('model.session'));

diff --git a/app/controllers/events/view/speakers/create.js b/app/controllers/events/view/speakers/create.js
@@ -7,7 +7,11 @@ export default Controller.extend({
         if (!sessionDetails) {
           await this.get('model.session').save();
         }
-        await this.get('model.speaker').save();
+        let newSpeaker = this.get('model.speaker');
+        if (newSpeaker.isEmailOverridden) {
+          newSpeaker.set('email', this.authManager.currentUser.email);
+        }
+        await newSpeaker.save();
         if (!sessionDetails) {
           this.get('model.speaker.sessions').pushObject(this.get('model.session'));
           await this.get('model.session').save();

diff --git a/app/controllers/events/view/speakers/edit.js b/app/controllers/events/view/speakers/edit.js
@@ -4,7 +4,11 @@ export default Controller.extend({
   actions: {
     save() {
       this.set('isLoading', true);
-      this.get('model.speaker').save()
+      let speaker = this.get('model.speaker');
+      if (speaker.isEmailOverridden) {
+        speaker.set('email', this.authManager.currentUser.email);
+      }
+      speaker.save()
         .then(() => {
           this.notify.success(this.l10n.t('Speaker details have been saved'));
           this.transitionToRoute('events.view.speakers');

diff --git a/app/models/speaker.js b/app/models/speaker.js
@@ -27,6 +27,7 @@ export default ModelBase.extend({
   linkedin           : attr('string'),
   organisation       : attr('string'),
   isFeatured         : attr('boolean', { default: false }),
+  isEmailOverridden  : attr('boolean', { default: false }),
   position           : attr('string'),
   country            : attr('string'),
   city               : attr('string'),

diff --git a/app/templates/components/forms/session-speaker-form.hbs b/app/templates/components/forms/session-speaker-form.hbs
@@ -121,6 +121,13 @@
               {{#if field.isLongText}}
                 {{widgets/forms/rich-text-editor value=(mut (get data.speaker field.fieldIdentifier))
                                                  textareaId=(if field.isRequired (concat 'speaker_' field.fieldIdentifier '_required') (concat 'speaker_' field.fieldIdentifier))}}
+              {{else if (eq field.fieldIdentifier 'email')}}
+                {{ui-checkbox label=(t 'Do not require email for this speaker.') checked=data.speaker.isEmailOverridden
+                              onChange=(action (mut data.speaker.isEmailOverridden))}}
+                {{#if (not data.speaker.isEmailOverridden)}}
+                  {{input type=field.type value=(mut (get data.speaker field.fieldIdentifier))
+                          id=(if field.isRequired (concat 'speaker_' field.fieldIdentifier '_required') (concat 'speaker_' field.fieldIdentifier))}}
+                {{/if}}
               {{else}}
                 {{input type=field.type value=(mut (get data.speaker field.fieldIdentifier)) id=(if field.isRequired (concat 'speaker_' field.fieldIdentifier '_required') (concat 'speaker_' field.fieldIdentifier))}}
               {{/if}}
@@ -185,6 +192,13 @@
             {{#if field.isLongText}}
               {{widgets/forms/rich-text-editor value=(mut (get data.speaker field.fieldIdentifier))
                 textareaId=(if field.isRequired (concat 'speaker_' field.fieldIdentifier '_required') (concat 'speaker_' field.fieldIdentifier))}}
+            {{else if (eq field.fieldIdentifier 'email')}}
+                {{ui-checkbox label=(t 'Do not require email for this speaker.') checked=data.speaker.isEmailOverridden
+                              onChange=(action (mut data.speaker.isEmailOverridden))}}
+                {{#if (not data.speaker.isEmailOverridden)}}
+                  {{input type=field.type value=(mut (get data.speaker field.fieldIdentifier))
+                          id=(if field.isRequired (concat 'speaker_' field.fieldIdentifier '_required') (concat 'speaker_' field.fieldIdentifier))}}
+                {{/if}}
             {{else}}
               {{#if field.isUrlField}}
                 {{widgets/forms/link-input