commit 0d1e0d7c2c02b90eb763a8d203e1b3792d102920
author Matteo Scandolo <teo@onlab.us> Thu Jan 28 13:44:23 2016 -0800
committer Matteo Scandolo <teo@onlab.us> Thu Jan 28 13:44:23 2016 -0800
tree 067a9185edbab2ce99d6fb19ffaf2a631f984de9
parent 7057e2091fb705499fdc1fb89b03a60289b2435f
parent 67962ea4ce20078f57fb2356d026870926cd1db9

Merge branch 'master' into feature/serviceTopology

applications/subscriberPortal/bs-config.js

diff --git a/applications/subscriberPortal/bs-config.js b/applications/subscriberPortal/bs-config.js
index f79f762..efe3abb 100644
--- a/applications/subscriberPortal/bs-config.js
+++ b/applications/subscriberPortal/bs-config.js
@@ -52,7 +52,6 @@
         req.url.indexOf('/xoslib/') !== -1 ||
         req.url.indexOf('/hpcapi/') !== -1
       ){
-        console.log(req.headers)
         if(req.headers['X-CSRFToken']){
           req.headers['x-csrftoken'] = req.headers['x-csrftoken'];
           req.headers.cookie = `xoscsrftoken=${req.headers['x-csrftoken']}; xossessionid=${req.headers['sessionid']}`;

applications/subscriberPortal/src/app/view/user/user.js

diff --git a/applications/subscriberPortal/src/app/view/user/user.js b/applications/subscriberPortal/src/app/view/user/user.js
index 57e0a4c..616529b 100644
--- a/applications/subscriberPortal/src/app/view/user/user.js
+++ b/applications/subscriberPortal/src/app/view/user/user.js
@@ -18,7 +18,7 @@
   'use strict';
 
   angular.module('cordUser', [])
-    .controller('CordUserCtrl', function ($log, $scope, $resource, $timeout, $filter, SubscriberUsers, cordConfig, SubscriberUsersUrlFilterLevel) {
+    .controller('CordUserCtrl', function ($log, $scope, $resource, $timeout, $filter, $cookies, SubscriberUsers, cordConfig, SubscriberUsersUrlFilterLevel) {
 
       $scope.page.curr = 'user';
       $scope.isFamily = false;