Merge upstream

2018-08-19 01:23:03 +02:00 · 2018-08-19 01:23:03 +02:00 · 56ddeec8f3
commit 56ddeec8f3
parent 5c3f6aebb9
3 changed files with 32 additions and 11 deletions
--- a/src/components/user_settings/user_settings.js
+++ b/src/components/user_settings/user_settings.js
@ -18,7 +18,8 @@ const UserSettings = {
      deleteAccountError: false,
      changePasswordInputs: [ '', '', '' ],
      changedPassword: false,
-      changePasswordError: false
+      changePasswordError: false,
+      activeTab: 'profile'
    }
  },
  components: {
@ -235,6 +236,9 @@ const UserSettings = {
            this.changePasswordError = res.error
          }
        })
+    },
+    activateTab (tabName) {
+      this.activeTab = tabName
    }
  }
 }