Merge pull request #56 from latin-language-toolkit/more_routing

Routing
alpheios-project · May 10, 2014 · fa0be08 · fa0be08
2 parents 2ea3b80 + e14b3ea
commit fa0be08
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/app/js/arethusa.core/routes/main.constant.js b/app/js/arethusa.core/routes/main.constant.js
@@ -5,21 +5,18 @@ angular.module('arethusa.core').constant('MAIN_ROUTE', {
   template: '<div ng-include="template"></div>',
   resolve: {
     loadConfiguration: function($q, $http, $route, configurator) {
-      var files = {
-        default: './static/configuration_default.json',
-        staging: './static/configuration1.json'
-      };
       var params = $route.current.params;
+      var confPath = './static/configs/';
       var confUrl;
 
       // Fall back to default and wrong paths to conf files
       // need to be handled separately eventually
       if (params.conf) {
-        confUrl = files[params.conf] || files.default;
+        confUrl = confPath + params.conf + '.json';
       } else if (params.conf_file) {
         confUrl = params.conf_file;
       } else {
-        confUrl = files.default;
+        confUrl = confPath + 'default.json';
       }
 
       return $http({

diff --git a/app/js/arethusa.js b/app/js/arethusa.js
@@ -10,5 +10,6 @@ angular.module(
   ],
   function($routeProvider, MAIN_ROUTE) {
     $routeProvider.when('/', MAIN_ROUTE);
+    $routeProvider.when('/:conf', MAIN_ROUTE);
   }
 );
diff --git a/app/static/configuration_default.json → app/static/configs/default.json b/app/static/configuration_default.json → app/static/configs/default.json
diff --git a/app/static/configuration1.json → app/static/configs/staging.json b/app/static/configuration1.json → app/static/configs/staging.json