Merge pull request #492 from appirio-tech/feature/tom-tracks-special-validation

updated track validation

Author: tladendo

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

@@ -35,12 +35,13 @@
 
       processData(vm.userData);
 
-      $scope.tracks = vm.tracks;
-      $scope.$watch('tracks', function watcher() {
-        if (!tracksValid()) {
-          toaster.pop('error', "Error", "Please select at least one track.");
-        }
-      }, true);
+      // commenting out since this might come back
+//      $scope.tracks = vm.tracks;
+//      $scope.$watch('tracks', function watcher() {
+//        if (!tracksValid()) {
+//          toaster.pop('error', "Error", "Please select at least one track.");
+//        }
+//      }, true);
 
       ExternalAccountService.getLinkedExternalAccounts(vm.userData.userId).then(function(data) {
         vm.linkedExternalAccounts = data;
@@ -117,6 +118,10 @@
     }
 
     function updateProfile() {
+      if (!vm.tracksValid()) {
+        toaster.pop('error', "Error", "Please select at least one track.");
+        return false;
+      }
       vm.profileFormProcessing = true;
       vm.userData.tracks = _.reduce(vm.tracks, function(result, isInterested, trackName) {
         if (isInterested) {

app/settings/edit-profile/edit-profile.jade

@@ -59,8 +59,8 @@
         track-toggle(tracks="vm.tracks")
 
     .save-section
-      button.tc-btn.tc-btn-primary.tc-btn-s(ng-show="!(vm.editProfile.$invalid || vm.editProfile.$pristine || !vm.tracksValid())", type="submit", tc-busy-button, tc-busy-when="vm.profileFormProcessing" ng-disabled="vm.editProfile.$invalid || vm.editProfile.$pristine", ng-class="{' ': vm.editProfile.$valid, 'disabled': disabled}") Save
-      button.tc-btn.tc-btn-secondary.tc-btn-s(ng-show="vm.editProfile.$invalid || vm.editProfile.$pristine || !vm.tracksValid()", type="button", disabled="disabled") Save
+      button.tc-btn.tc-btn-primary.tc-btn-s(ng-show="!(vm.editProfile.$invalid || vm.editProfile.$pristine)", type="submit", tc-busy-button, tc-busy-when="vm.profileFormProcessing" ng-disabled="vm.editProfile.$invalid || vm.editProfile.$pristine", ng-class="{' ': vm.editProfile.$valid, 'disabled': disabled}") Save
+      button.tc-btn.tc-btn-secondary.tc-btn-s(ng-show="vm.editProfile.$invalid || vm.editProfile.$pristine", type="button", disabled="disabled") Save
 
   .settings-section.skills
     .section-info