From 4e16edf4bacb5c2fbc52f18a65fa46274304a0bb Mon Sep 17 00:00:00 2001 From: Jon Lambson Date: Tue, 31 Oct 2017 12:25:37 -0600 Subject: [PATCH 1/3] fixing ng-src --- templates/website.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/website.html b/templates/website.html index 9166f29..74c3644 100644 --- a/templates/website.html +++ b/templates/website.html @@ -117,7 +117,7 @@
  • - +
    From f02300ed2b6b3be3a02f8cb378b4586288a807e3 Mon Sep 17 00:00:00 2001 From: Jon Lambson Date: Tue, 31 Oct 2017 12:26:56 -0600 Subject: [PATCH 2/3] uncomment code --- js/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/app.js b/js/app.js index 4555a2c..6ed0ac1 100644 --- a/js/app.js +++ b/js/app.js @@ -163,7 +163,7 @@ app.run(['$rootScope', '$state', 'Auth', '$location', function($rootScope, $stat }; $rootScope.$on('$stateChangeStart', function(event, toState, toParams, fromState, fromParams) { var requiresLogin = toState.data.requiresLogin; - // toState.data.session = $location.search(); + toState.data.session = $location.search(); $rootScope.redirectedURL = toState.url; var query = $location.search(); $rootScope.urlArray.push($rootScope.redirectedURL); From c7444e2c84824e3bc54d747e4a29a3e3b3be99a5 Mon Sep 17 00:00:00 2001 From: Drew Warren Date: Tue, 31 Oct 2017 18:51:42 +0000 Subject: [PATCH 3/3] Add return to failure case --- js/controllers/website-controller.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/js/controllers/website-controller.js b/js/controllers/website-controller.js index 5cae9b8..19a6990 100644 --- a/js/controllers/website-controller.js +++ b/js/controllers/website-controller.js @@ -111,11 +111,14 @@ app.controller('websiteCtrl', [ el.session = session.token.sub + '@' + session.token.iss; }); - }); + }, function(err) { + console.error("There was an error 1A", err); + return els; + }); }); })).then(function (results) { return els; - }); + }, function(err) {console.error("There was an error 1B", err)}); }; vm.getDomains = function () {