From 82f35e221f6dba1490bd1e42fd7db35e38411cb0 Mon Sep 17 00:00:00 2001
From: Brian Smith <briansmith@jamkazam.com>
Date: Wed, 18 Mar 2015 21:42:18 -0400
Subject: [PATCH] VRFS-2701 fixed cancel and back buttons

---
 web/app/assets/javascripts/accounts_profile.js            | 2 +-
 web/app/assets/javascripts/accounts_profile_experience.js | 4 ++--
 web/app/assets/javascripts/accounts_profile_interests.js  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/web/app/assets/javascripts/accounts_profile.js b/web/app/assets/javascripts/accounts_profile.js
index e38c25ce8..c418c213f 100644
--- a/web/app/assets/javascripts/accounts_profile.js
+++ b/web/app/assets/javascripts/accounts_profile.js
@@ -234,7 +234,7 @@
 
     function navToAccount() {
       resetForm();
-      window.location = '/client#/account';
+      window.location = '/client#/profile/' + context.JK.currentUserId;
     }
 
     function navToAvatar() {
diff --git a/web/app/assets/javascripts/accounts_profile_experience.js b/web/app/assets/javascripts/accounts_profile_experience.js
index df0e2c39f..f3b0443d5 100644
--- a/web/app/assets/javascripts/accounts_profile_experience.js
+++ b/web/app/assets/javascripts/accounts_profile_experience.js
@@ -121,8 +121,8 @@
     }
 
     function events() {
-      $screen.find('#account-edit-profile-cancel').on('click', function(evt) { evt.stopPropagation(); navigateTo('/client#/account'); return false; } );
-      $screen.find('#account-edit-profile-back').on('click', function(evt) { evt.stopPropagation(); navigateTo('/client#/account/profile'); return false; } );
+      $screen.find('#account-edit-profile-cancel').on('click', function(evt) { evt.stopPropagation(); navigateTo('/client#/profile/' + context.JK.currentUserId); return false; } );
+      $screen.find('#account-edit-profile-back').on('click', function(evt) { evt.stopPropagation(); navigateTo('/client#/account/profile/'); return false; } );
       $screen.find('#account-edit-profile-submit').on('click', function(evt) { evt.stopPropagation(); handleUpdateProfile(); return false; } );
     }
 
diff --git a/web/app/assets/javascripts/accounts_profile_interests.js b/web/app/assets/javascripts/accounts_profile_interests.js
index 35f2ba1ee..814eb73b0 100644
--- a/web/app/assets/javascripts/accounts_profile_interests.js
+++ b/web/app/assets/javascripts/accounts_profile_interests.js
@@ -167,7 +167,7 @@
       bindGenreSelector($btnFreeSessionsGenreSelect, $freeSessionsGenreList);
       bindGenreSelector($btnCowritingGenreSelect, $cowritingGenreList);
 
-      $btnCancel.on('click', function(evt) { evt.stopPropagation(); navigateTo('/client#/account'); return false; } );
+      $btnCancel.on('click', function(evt) { evt.stopPropagation(); navigateTo('/client#/profile/' + context.JK.currentUserId); return false; } );
       $btnBack.on('click', function(evt) { evt.stopPropagation(); navigateTo('/client#/account/profile/experience'); return false; } );
       $btnSubmit.on('click', function(evt) { evt.stopPropagation(); handleUpdateProfile(); return false; } );