Bug 1425728 - Fix cancel from add config files page

If you click create secret, then cancel out both forms, you go back to the create secret page. Use `$window.history.back()` instead of a `then` parameter from the create secret page to prevent this. https://bugzilla.redhat.com/show_bug.cgi?id=1425728
openshift · Feb 22, 2017 · bbad484 · bbad484
1 parent 5d8765c
commit bbad484
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 8 deletions.
diff --git a/app/scripts/controllers/addConfigVolume.js b/app/scripts/controllers/addConfigVolume.js
@@ -63,9 +63,6 @@ angular.module('openshiftConsole')
       includeProject: true
     });
 
-    // Return URL for creating secrets.
-    $scope.returnURL = $location.url();
-
     var humanizeKind = $filter('humanizeKind');
     $scope.groupByKind = function(object) {
       return humanizeKind(object.kind);

diff --git a/app/scripts/controllers/createSecret.js b/app/scripts/controllers/createSecret.js
@@ -43,7 +43,7 @@ angular.module('openshiftConsole')
         return;
       }
 
-      Navigate.toResourceList('secrets', $scope.projectName);
+      $window.history.back();
     };
 
     ProjectsService

diff --git a/app/views/add-config-volume.html b/app/views/add-config-volume.html
@@ -61,7 +61,7 @@ <h1>Add Config Files</h1>
                             </span>
                             <span ng-if="'secrets' | canI : 'create'">
                               <span ng-if="'configmaps' | canI : 'create'" class="action-divider" aria-hidden="true">|</span>
-                              <a ng-href="project/{{project.metadata.name}}/create-secret?then={{returnURL | encodeURIComponent}}">Create Secret</a>
+                              <a ng-href="project/{{project.metadata.name}}/create-secret">Create Secret</a>
                             </span>
                           </div>
                           <div class="help-block">

diff --git a/dist/scripts/scripts.js b/dist/scripts/scripts.js
@@ -6991,7 +6991,7 @@ link:"project/" + d.projectName + "/browse/secrets"
 title:"Create Secret"
 } ];
 var l = function() {
-return c.then ? void b.url(c.then) :void j.toResourceList("secrets", d.projectName);
+return c.then ? void b.url(c.then) :void e.history.back();
 };
 k.get(c.project).then(_.spread(function(b, e) {
 return d.project = b, d.context = e, d.breadcrumbs[0].title = a("displayName")(b), h.canI("secrets", "create", c.project) ? (d.postCreateAction = function(a, b) {
@@ -9182,7 +9182,7 @@ kind:c.kind,
 namespace:c.project,
 subpage:"Add Config Files",
 includeProject:!0
-}), d.returnURL = b.url();
+});
 var p = a("humanizeKind");
 d.groupByKind = function(a) {
 return p(a.kind);

diff --git a/dist/scripts/templates.js b/dist/scripts/templates.js
@@ -982,7 +982,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</span>\n" +
     "<span ng-if=\"'secrets' | canI : 'create'\">\n" +
     "<span ng-if=\"'configmaps' | canI : 'create'\" class=\"action-divider\" aria-hidden=\"true\">|</span>\n" +
-    "<a ng-href=\"project/{{project.metadata.name}}/create-secret?then={{returnURL | encodeURIComponent}}\">Create Secret</a>\n" +
+    "<a ng-href=\"project/{{project.metadata.name}}/create-secret\">Create Secret</a>\n" +
     "</span>\n" +
     "</div>\n" +
     "<div class=\"help-block\">\n" +