Fix drugis#53: redirect after chooseProblem

- the code that passed workspaceId and scenarioId to the redirect had been removed (???)
chinook25 · Apr 29, 2014 · 9136da7 · 9136da7
1 parent 8e9e663
commit 9136da7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/app-remote/src/main/webapp/WEB-INF/views/index.jsp b/app-remote/src/main/webapp/WEB-INF/views/index.jsp
@@ -72,7 +72,7 @@
       examplesRepository : "examples/",
       workspacesRepository : {
         service : "RemoteWorkspaces",
-        url : "workspaces/",
+        url : "/workspaces/",
         _csrf_token : "${_csrf.token}",
         _csrf_header : "${_csrf.headerName}"
       }

diff --git a/app/js/services/remoteWorkspaces.js b/app/js/services/remoteWorkspaces.js
@@ -37,8 +37,8 @@ define(['mcda/config', 'angular', 'angular-resource', 'underscore'],
         }
       });
 
-      var redirectToDefaultView = function() {
-        $state.go(Config.defaultView);
+      var redirectToDefaultView = function(workspaceId, scenarioId) {
+        $state.go(Config.defaultView, {workspaceId: workspaceId, scenarioId: scenarioId});
       };
 
       var decorate = function(workspace) {
@@ -55,7 +55,11 @@ define(['mcda/config', 'angular', 'angular-resource', 'underscore'],
         );
 
         workspace.redirectToDefaultView = function(scenarioId) {
-          $state.go(Config.defaultView);
+          if (scenarioId) {
+            redirectToDefaultView(workspace.id, scenarioId);
+          } else {
+            redirectToDefaultView(workspace.id, workspace.defaultScenarioId);
+          }
         };
 
         ScenarioResource.prototype.save = function() {
@@ -166,4 +170,4 @@ define(['mcda/config', 'angular', 'angular-resource', 'underscore'],
     };
 
     return angular.module('elicit.remoteWorkspaces', dependencies).factory('RemoteWorkspaces', Workspaces);
-  });
+  });