Skip to content
This repository was archived by the owner on Mar 4, 2025. It is now read-only.

Fixed saving and tab switching for settings #368

Merged
merged 1 commit into from
Oct 16, 2015
Merged

Fixed saving and tab switching for settings #368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions app/settings/account-info/account-info.controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -31,7 +32,7 @@
});

vm.countries = ISO3166.getAllCountryObjects();
vm.countryObj = ISO3166.getCountryObjFromAlpha3(userData.homeCountryCode);
vm.countryObj = ISO3166.getCountryObjFromAlpha3(vm.userData.homeCountryCode);

// Timeout needed since newPasswordForm.currentPassword doesn't exist until later
$timeout(function(){
Expand All @@ -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;
}
}

Expand All @@ -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'}) || {};
}

Expand Down
15 changes: 8 additions & 7 deletions app/settings/edit-profile/edit-profile.controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
activate();

function activate() {
vm.userData = userData.clone();
vm.linkedExternalAccounts = [];
vm.linkedExternalAccountsData = {};
vm.skills = false;
Expand All @@ -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;
});

Expand Down Expand Up @@ -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;
Expand All @@ -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'),
};
}
}
Expand Down