Merge branch 'dev' into feature/tom-address/validation

Conflicts:
	app/settings/account-info/account-info.controller.js

Author: tladendo

app/settings/account-info/account-info.controller.js

@@ -15,12 +15,13 @@
       accountInfoForm: false,
       newPasswordForm: false
     };
+    var originalUserData = userData;
 
     activate();
 
     function activate() {
-      processData();
-      vm.userData = userData;
+      vm.userData = userData.clone();
+      processData(vm.userData);
       UserService.getUserProfile({fields: 'credential'})
       .then(function(res) {
         vm.isSocialRegistrant = !res.credential.hasPassword;
@@ -31,7 +32,7 @@
       });
 
       vm.countries = ISO3166.getAllCountryObjects();
-      vm.countryObj = ISO3166.getCountryObjFromAlpha3(userData.competitionCountryCode);
+      vm.countryObj = ISO3166.getCountryObjFromAlpha3(vm.userData.homeCountryCode);
 
       // Timeout needed since newPasswordForm.currentPassword doesn't exist until later
       $timeout(function(){
@@ -53,7 +54,7 @@
       var isValidCountry = _.isUndefined(countryCode) ? false : true;
       vm.accountInfoForm.country.$setValidity('required', isValidCountry);
       if (isValidCountry) {
-        userData.homeCountryCode = countryCode;
+        vm.userData.homeCountryCode = countryCode;
       }
     }
 
@@ -69,19 +70,20 @@
 
     function saveAccountInfo() {
       vm.formProcessing.accountInfoForm = true;
-      userData.addresses = getAddr();
-      ProfileService.updateUserProfile(userData)
+      vm.userData.addresses = getAddr();
+      ProfileService.updateUserProfile(vm.userData)
       .then(function(data) {
         vm.formProcessing.accountInfoForm = false;
         toaster.pop('success', "Success!", "Your account information was updated.");
+        for (var k in vm.userData) userData[k] = vm.userData[k];
       })
       .catch(function() {
         vm.formProcessing.accountInfoForm = false;
         toaster.pop('error', "Whoops!", "Something went wrong. Please try again later.");
       })
     }
 
-    function processData() {
+    function processData(userData) {
       vm.homeAddress = _.find(userData.addresses, {type: 'HOME'}) || {};
     }
 

app/settings/edit-profile/edit-profile.controller.js

@@ -18,6 +18,7 @@
     activate();
 
     function activate() {
+      vm.userData = userData.clone();
       vm.linkedExternalAccounts = [];
       vm.linkedExternalAccountsData = {};
       vm.skills = false;
@@ -26,12 +27,11 @@
       vm.tracks = {};
 
       vm.countries = ISO3166.getAllCountryObjects();
-      vm.countryObj = ISO3166.getCountryObjFromAlpha3(userData.competitionCountryCode);
+      vm.countryObj = ISO3166.getCountryObjFromAlpha3(vm.userData.competitionCountryCode);
 
-      processData(userData);
-      vm.userData = userData;
+      processData(vm.userData);
 
-      ExternalAccountService.getLinkedExternalAccounts(userData.userId).then(function(data) {
+      ExternalAccountService.getLinkedExternalAccounts(vm.userData.userId).then(function(data) {
         vm.linkedExternalAccounts = data;
       });
 
@@ -114,6 +114,7 @@
         vm.profileFormProcessing = false;
         $log.info('Saved successfully');
         toaster.pop('success', "Success!", "Your account information was updated.");
+        for (var k in vm.userData) userData[k] = vm.userData[k];
       })
       .catch(function(err) {
         vm.profileFormProcessing = false;
@@ -128,9 +129,9 @@
 
     function processData(userInfo) {
       vm.tracks = {
-        DESIGN: _.contains(userData.tracks, 'DESIGN'),
-        DEVELOP: _.contains(userData.tracks, 'DEVELOP'),
-        DATA_SCIENCE: _.contains(userData.tracks, 'DATA_SCIENCE'),
+        DESIGN: _.contains(userInfo.tracks, 'DESIGN'),
+        DEVELOP: _.contains(userInfo.tracks, 'DEVELOP'),
+        DATA_SCIENCE: _.contains(userInfo.tracks, 'DATA_SCIENCE'),
       };
     }
   }