v1.08.51

Fixed links in case web-context change, sorting direction for uploads, and so +'s aren't changed to <spaces> in the terminal.
bastillion-io · Sep 19, 2013 · 1bde199 · 1bde199
1 parent ca049e5
commit 1bde199
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.keybox</groupId>
     <artifactId>keybox</artifactId>
-    <version>1.08.50</version>
+    <version>1.08.51</version>
     <packaging>war</packaging>
     <name>KeyBox</name>
     <properties>
@@ -80,7 +80,7 @@
             <plugin>
                 <groupId>org.mortbay.jetty</groupId>
                 <artifactId>jetty-maven-plugin</artifactId>
-		<version>8.1.12.v20130726</version>
+		        <version>8.1.12.v20130726</version>
                 <configuration>
                     <scanIntervalSeconds>-1</scanIntervalSeconds>
                     <connectors>

diff --git a/src/main/java/com/keybox/manage/db/SystemStatusDB.java b/src/main/java/com/keybox/manage/db/SystemStatusDB.java
@@ -429,7 +429,7 @@ private static List<SystemStatus> getAllSystemStatus(Connection con) {
         List<SystemStatus> systemStatusList = new ArrayList<SystemStatus>();
         try {
 
-            PreparedStatement stmt = con.prepareStatement("select * from status");
+            PreparedStatement stmt = con.prepareStatement("select * from status order by id asc");
             ResultSet rs = stmt.executeQuery();
 
             while (rs.next()) {
@@ -498,7 +498,7 @@ public static SystemStatus getNextPendingSystem() {
         Connection con = null;
         try {
             con = DBUtils.getConn();
-            PreparedStatement stmt = con.prepareStatement("select * from status where status_cd like ? or status_cd like ? or status_cd like ?");
+            PreparedStatement stmt = con.prepareStatement("select * from status where status_cd like ? or status_cd like ? or status_cd like ? order by id asc");
             stmt.setString(1,SystemStatus.INITIAL_STATUS);
             stmt.setString(2,SystemStatus.AUTH_FAIL_STATUS);
             stmt.setString(3,SystemStatus.PUBLIC_KEY_FAIL_STATUS);

diff --git a/src/main/webapp/manage/secure_shell.jsp b/src/main/webapp/manage/secure_shell.jsp
@@ -113,7 +113,7 @@ $(document).ready(function() {
             idListStr = idListStr + '&idList=' + entry;
         });
 
-        $("#upload_push_frame").attr("src", "/manage/setUpload.action" + idListStr);
+        $("#upload_push_frame").attr("src", "setUpload.action" + idListStr);
         $("#upload_push_dialog").dialog("open");
 
 
@@ -158,7 +158,8 @@ $(document).ready(function() {
             });
 
             if(String.fromCharCode(keyCode) && String.fromCharCode(keyCode)!='' && !keys[17]){
-                $.ajax({ url: 'runCmd.action?command=' +String.fromCharCode(keyCode) + idListStr});
+                var cmdStr=String.fromCharCode(keyCode).replace("+","%2b");
+                $.ajax({ url: 'runCmd.action?command=' +cmdStr + idListStr});
             }
 
         });
@@ -241,7 +242,7 @@ $(document).ready(function() {
 
                 <div id="select_all" class="top_link">Select All</div>
                 <div id="upload_push" class="top_link">Upload &amp; Push</div>
-                 <div class="top_link" ><a href="/manage/exitTerms.action">Exit Terminals</a></div>
+                 <div class="top_link" ><a href="exitTerms.action">Exit Terminals</a></div>
                  <div class="note" style="float:right;">(Use CMD-Click or CTRL-Click to select multiple individual terminals)</div>
                 <div class="clear"></div>