Merge 8b7171a into a947c03

TryGhost · Mar 9, 2018 · 1454b05 · 1454b05
2 parents a947c03 + 8b7171a
commit 1454b05
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/app/controllers/settings/general.js b/app/controllers/settings/general.js
@@ -103,12 +103,20 @@ export default Controller.extend({
         },
 
         toggleIsPrivate(isPrivate) {
-            this.set('settings.isPrivate', isPrivate);
-            this.get('settings.errors').remove('password');
+            let settings = this.get('settings');
+
+            settings.set('isPrivate', isPrivate);
+            settings.get('errors').remove('password');
+
+            let changedAttrs = settings.changedAttributes();
 
             // set a new random password when isPrivate is enabled
-            if (isPrivate && this.get('settings.hasDirtyAttributes')) {
-                this.get('settings').set('password', randomPassword());
+            if (isPrivate && changedAttrs.isPrivate) {
+                settings.set('password', randomPassword());
+
+            // reset the password when isPrivate is disabled
+            } else if (changedAttrs.password) {
+                settings.set('password', changedAttrs.password[0]);
             }
         },
 

diff --git a/app/services/settings.js b/app/services/settings.js
@@ -68,5 +68,9 @@ export default Service.extend(_ProxyMixin, ValidationEngine, {
 
     rollbackAttributes() {
         return this.get('content').rollbackAttributes();
+    },
+
+    changedAttributes() {
+        return this.get('content').changedAttributes();
     }
 });