add tx actions to all node responses

fcrepo · Jun 26, 2013 · 4ef7bbb · 4ef7bbb
1 parent cf63e95
commit 4ef7bbb
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 20 deletions.
diff --git a/fcrepo-http-api/src/main/resources/views/common-header.vsl b/fcrepo-http-api/src/main/resources/views/common-header.vsl
@@ -7,13 +7,15 @@
         <ul class="nav">
             <li><a href="$uriInfo.baseUriBuilder.build()">Home</a></li>
             <li><a href="$uriInfo.baseUriBuilder.build()fcr:namespaces">Namespaces</a></li>
+
         </ul>
 
         <form class="navbar-search pull-right" method="GET" action="$uriInfo.baseUriBuilder.build()fcr:search">
             <div class="input-append">
                 <input class="search-query" type="text" name="q" placeholder="Search"/>
             </div>
         </form>
+
         </div>
         </div>
     </div>
diff --git a/fcrepo-http-api/src/main/resources/views/common-node-actions.vsl b/fcrepo-http-api/src/main/resources/views/common-node-actions.vsl
@@ -78,4 +78,32 @@ WHERE { }
     <button type="submit" class="btn">Import</button>
 </form>
 
-#end
+#end
+
+
+
+<hr />
+
+<h3>Transactions</h3>
+#if($uriInfo.getAbsolutePath().toString().contains("/tx:"))
+
+    #set ($absPath = $uriInfo.absolutePathBuilder.build().toString())
+
+    #set ($txNodePath = $absPath.indexOf("/", $helpers.addOne($absPath.indexOf("/tx:"))))
+    #if ($txNodePath != -1)
+        #set ($txPath = $absPath.substring(0, $txNodePath))
+    #else
+        #set ($txPath = $uriInfo.getAbsolutePath().toString())
+    #end
+<form id="action_commit_transaction" data-redirect-after-submit="$uriInfo.baseUriBuilder.build()" action="$txPath/fcr:tx/fcr:commit" method="POST">
+    <button type="submit" class="btn btn-primary">Commit</button>
+</form>
+
+<form  id="action_rollback_transaction" data-redirect-after-submit="$uriInfo.baseUriBuilder.build()" action="$txPath/fcr:tx/fcr:rollback" method="POST">
+    <button type="submit" class="btn btn-danger">Rollback</button>
+</form>
+#else
+<form  id="action_create_transaction" action="$uriInfo.baseUriBuilder.build()fcr:tx" method="POST">
+    <button type="submit" class="btn btn-primary">Start Transaction</button>
+</form>
+#end
diff --git a/fcrepo-http-api/src/main/resources/views/mode-root.vsl b/fcrepo-http-api/src/main/resources/views/mode-root.vsl
@@ -43,25 +43,6 @@
         ## output actions
     <div class="actions">
         #parse("views/common-node-actions.vsl")
-        <hr />
-
-        <div>
-
-            <h3>Transactions</h3>
-        #if($uriInfo.getAbsolutePath().toString().contains("/tx:"))
-            <form id="action_commit_transaction" data-redirect-after-submit="$uriInfo.baseUriBuilder.build()" action="$uriInfo.absolutePathBuilder.build()/fcr:tx/fcr:commit" method="POST">
-                <button type="submit" class="btn">Commit</button>
-            </form>
-
-            <form id="action_rollback_transaction" data-redirect-after-submit="$uriInfo.baseUriBuilder.build()" action="$uriInfo.absolutePathBuilder.build()/fcr:tx/fcr:rollback" method="POST">
-                <button type="submit" class="btn btn-danger">Rollback</button>
-            </form>
-        #else
-            <form id="action_create_transaction" action="$uriInfo.baseUriBuilder.build()fcr:tx" method="POST">
-                <button type="submit" class="btn">Begin</button>
-            </form>
-        #end
-        </div>
 
     </div>
 

diff --git a/fcrepo-http-commons/src/main/java/org/fcrepo/responses/ViewHelpers.java b/fcrepo-http-commons/src/main/java/org/fcrepo/responses/ViewHelpers.java
@@ -196,4 +196,8 @@ public String getPrefixPreamble(final PrefixMapping mapping) {
     public Node asNode(final Resource r) {
         return r.asNode();
     }
+
+    public int addOne(final int i) {
+        return i + 1;
+    }
 }