Fixes resource loading on page load.
Project: http://git-wip-us.apache.org/repos/asf/rave/repo Commit: http://git-wip-us.apache.org/repos/asf/rave/commit/4604a9e3 Tree: http://git-wip-us.apache.org/repos/asf/rave/tree/4604a9e3 Diff: http://git-wip-us.apache.org/repos/asf/rave/diff/4604a9e3 Branch: refs/heads/angular Commit: 4604a9e312de208f255e55a9de20d4fb04cac1b6 Parents: fa2ca2e Author: Jmeas <[email protected]> Authored: Thu Aug 14 20:03:58 2014 -0400 Committer: Jmeas <[email protected]> Committed: Thu Aug 14 20:08:24 2014 -0400 ---------------------------------------------------------------------- rave-portal-ng/src/subapps/admin/preferences/routes.js | 2 +- rave-portal-ng/src/subapps/auth/security/services/security.js | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/rave/blob/4604a9e3/rave-portal-ng/src/subapps/admin/preferences/routes.js ---------------------------------------------------------------------- diff --git a/rave-portal-ng/src/subapps/admin/preferences/routes.js b/rave-portal-ng/src/subapps/admin/preferences/routes.js index 650ee58..e054699 100644 --- a/rave-portal-ng/src/subapps/admin/preferences/routes.js +++ b/rave-portal-ng/src/subapps/admin/preferences/routes.js @@ -24,7 +24,7 @@ define(function(require) { }], resolve: { preferences: ['preferencesResource', function(preferencesResource) { - return preferencesResource.get(); + return preferencesResource.get(); }] } }); http://git-wip-us.apache.org/repos/asf/rave/blob/4604a9e3/rave-portal-ng/src/subapps/auth/security/services/security.js ---------------------------------------------------------------------- diff --git a/rave-portal-ng/src/subapps/auth/security/services/security.js b/rave-portal-ng/src/subapps/auth/security/services/security.js index 7e2cc2c..6650bad 100644 --- a/rave-portal-ng/src/subapps/auth/security/services/security.js +++ b/rave-portal-ng/src/subapps/auth/security/services/security.js @@ -16,6 +16,12 @@ define(function(require) { return ['$rootScope', 'authToken', '$q', 'authApi', 'authCache', '$state', 'locationCache', '$http', function($rootScope, authToken, $q, authApi, authCache, $state, locationCache, $http) { + + // Naive setting of our token. This is for resources that are requested on page load; + // it's unverified, though, so it might not even work, and, in those cases, the resource + // pages are set up to display the proper error. + $http.defaults.headers.common.Authorization = 'Basic ' + authToken.get(); + return { // Returns a promise that resolves true or rejects false.
