Using Ember Data's change tracking to reset the value

Closes #9472
- changes according to pr #964 comment
- using Ember Data's change tracking to reset the value

app/controllers/settings/general.js

@@ -34,8 +34,6 @@ export default Controller.extend({
     _scratchFacebook: null,
     _scratchTwitter: null,
 
-    _initialPasswordVal: null,
-
     isDatedPermalinks: computed('settings.permalinks', {
         set(key, value) {
             this.set('settings.permalinks', value ? '/:year/:month/:day/:slug/' : '/:slug/');
@@ -105,14 +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());
-            } else {
-                this.get('settings').set('password', this._initialPasswordVal);
+            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]);
             }
         },
 

app/routes/settings/general.js

@@ -29,7 +29,6 @@ export default AuthenticatedRoute.extend(styleBody, CurrentUserSettings, {
         // reset the leave setting transition
         controller.set('leaveSettingsTransition', null);
         controller.set('availableTimezones', models.availableTimezones);
-        controller.set('_initialPasswordVal', models.settings.get('password'));
     },
 
     actions: {

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();
     }
 });