Squash and cherry-pick fix from #7446 (Fixes #7283)

Co-authored-by: mdctleo <mdctleo@users.noreply.github.com>
learningequality · Sep 28, 2020 · 6db8ff6 · 6db8ff6
1 parent 96a0acb
commit 6db8ff6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/AUTHORS.md b/AUTHORS.md
@@ -44,6 +44,7 @@ If you have contributed to Kolibri, feel free to add your name and Github accoun
 | Julián Duque | julianduque |
 | Karla Avila | k2avila |
 | Kevin Ollivier | kollivier |
+| Leo Lin | mdctleo |
 | Paul Luna | luna215 |
 | Lingyi Wang | lyw07 |
 | Magali Boizot-Roche | magali-br |

diff --git a/kolibri/plugins/facility/assets/src/views/FacilityConfigPage/index.vue b/kolibri/plugins/facility/assets/src/views/FacilityConfigPage/index.vue
@@ -55,13 +55,14 @@
                 :key="setting"
                 :label="$tr('learnerNeedPasswordToLogin')"
                 :checked="!settings['learner_can_login_with_no_password']"
-                @change="toggleSetting('learner_can_login_with_no_password')"
+                @change="toggleLearnerLoginPassword()"
               />
               <KCheckbox
                 :key="setting + 'learner_can_edit_password'"
                 :disabled="enableChangePassword"
                 :label="$tr('learnerCanEditPassword')"
-                :checked="settings['learner_can_edit_password']"
+                :checked="!settings['learner_can_login_with_no_password']
+                  && settings['learner_can_edit_password']"
                 class="checkbox-password"
                 @change="toggleSetting('learner_can_edit_password')"
               />
@@ -208,6 +209,15 @@
           value: !this.settings[settingName],
         });
       },
+      toggleLearnerLoginPassword() {
+        this.toggleSetting('learner_can_login_with_no_password');
+        if (
+          this.settings['learner_can_edit_password'] &&
+          !this.settings['learner_can_login_with_no_password']
+        ) {
+          this.toggleSetting('learner_can_edit_password');
+        }
+      },
       dismissNotification() {
         this.$store.commit('facilityConfig/CONFIG_PAGE_NOTIFY', null);
       },