fix bad create link on formTable view

hawtio · Mar 26, 2013 · ca6fb7b · ca6fb7b
1 parent ef09723
commit ca6fb7b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/hawtio-web/src/main/webapp/app/wiki/js/helpers.ts b/hawtio-web/src/main/webapp/app/wiki/js/helpers.ts
@@ -33,18 +33,18 @@ module Wiki {
   }
 
   export function createLink(pageId:string, $location, $scope) {
+    var path = $location.path();
     var link = null;
     if (pageId) {
       link = "#/wiki/create/" + pageId;
     } else {
       // lets use the current path
-      var path = $location.path();
-      link = "#" + path.replace(/(view|edit)/, "create");
+      link = "#" + path.replace(/(view|edit|formTable)/, "create");
     }
     // we have the link so lets now remove the last path
     // or if there is no / in the path then remove the last section
     var idx = link.lastIndexOf("/");
-    if (idx > 0 && !$scope.children) {
+    if (idx > 0 && !$scope.children && !path.startsWith("/wiki/formTable")) {
       link = link.substring(0, idx + 1);
     }
     return link;

diff --git a/hawtio-web/src/main/webapp/app/wiki/js/navbar.ts b/hawtio-web/src/main/webapp/app/wiki/js/navbar.ts
@@ -1,7 +1,10 @@
 module Wiki {
   export function NavBarController($scope, $location, $routeParams, workspace:Workspace, wikiRepository:GitWikiRepository) {
 
-    $scope.createLink = () => Wiki.createLink(Wiki.pageId($routeParams, $location), $location, $scope);
+    $scope.createLink = () => {
+      var pageId = Wiki.pageId($routeParams, $location);
+      return Wiki.createLink(pageId, $location, $scope);
+    };
 
     $scope.sourceLink = () => {
       var path = $location.path();