Bugzilla BZ 646545 - TPS Agent tab: displays approve list parameter with last character chopped.

git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1455 c9f7a03b-bd48-0410-a16d-cbbf54688b0b

7 files changed, 18 insertions, 23 deletions

diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/addConfig.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/addConfig.template
index 6289f17b5..4051ead83 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/addConfig.template
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/addConfig.template
@@ -52,7 +52,6 @@ if (typeof(uriBase) == "undefined") {
     uri0 += uriBase;
 }
 
-var disp_conf_type = conf_type.replace(/_/g, " ").substring(0, conf_type.length -1);
 document.write("<font face=\"PrimaSans BT, Verdana, sans-serif\" size=\"+1\">"+
                "<a href=\""+uri0+"\">Main Menu</a> : Administrator Operations : Add " + disp_conf_type + " Configuration </font>\n");
 
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/agentSelectConfig.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/agentSelectConfig.template
index ccbf1144b..3d22858cd 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/agentSelectConfig.template
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/agentSelectConfig.template
@@ -52,7 +52,6 @@ if (typeof(uriBase) == "undefined") {
     uri0 += uriBase;
 }
 
-var disp_conf_type = conf_type.replace(/_/g, " ").substring(0, conf_type.length -1);
 document.write("<font face=\"PrimaSans BT, Verdana, sans-serif\" size=\"+1\">"+
                "<a href=\""+uri0+"\">Main Menu</a> : Agent Operations : " + disp_conf_type + " Review and Approval </font>\n");
 
@@ -90,7 +89,7 @@ function doCancel() {
 
 
     document.write("<table BORDER=0 CELLSPACING=2 CELLPADDING=0 width=100%>\n");
-    document.write("<tr colspan=3>  <p> Use this form to select " + disp_conf_type.toLowerCase() + "s for review. <br>" + 
+    document.write("<tr colspan=3>  <p> Use this form to select " + conf_type.replace(/_/g, " ").toLowerCase() + " for review. <br>" + 
          "Select an item in the drop-down menu below and click \"Review\". </p></tr>");
 
     document.write("<form NAME =\"selectViewConfigForm\" METHOD=POST onSubmit=\"return doViewConfig(this);\">");
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/agentViewConfig.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/agentViewConfig.template
index 4741f53d2..29f2dd1d5 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/agentViewConfig.template
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/agentViewConfig.template
@@ -52,7 +52,6 @@ if (typeof(uriBase) == "undefined") {
     uri0 += uriBase;
 }
 
-var disp_conf_type = conf_type.replace(/_/g, " ").substring(0, conf_type.length -1);
 document.write("<font face=\"PrimaSans BT, Verdana, sans-serif\" size=\"+1\">"+
                "<a href=\""+uri0+"\">Main Menu</a> : Agent Operations : " + disp_conf_type + " Review </font>\n");
 
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/confirmConfigChanges.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/confirmConfigChanges.template
index 583f9d012..8dfe53554 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/confirmConfigChanges.template
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/confirmConfigChanges.template
@@ -66,7 +66,6 @@ String.prototype.escapeEntry = function () {
 };
 
 
-var disp_conf_type = conf_type.replace(/_/g, " ").substring(0, conf_type.length -1);
 document.write("<font face=\"PrimaSans BT, Verdana, sans-serif\" size=\"+1\">"+
                "<a href=\""+uri0+"\">Main Menu</a> : Administrator Operations : " + disp_conf_type + " Configuration </font>\n");
 
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/confirmDeleteConfig.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/confirmDeleteConfig.template
index 92a36c33e..08fc65cdc 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/confirmDeleteConfig.template
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/confirmDeleteConfig.template
@@ -52,7 +52,6 @@ if (typeof(uriBase) == "undefined") {
     uri0 += uriBase;
 }
 
-var disp_conf_type = conf_type.replace(/_/g, " ").substring(0, conf_type.length -1);
 document.write("<font face=\"PrimaSans BT, Verdana, sans-serif\" size=\"+1\">"+
                "<a href=\""+uri0+"\">Main Menu</a> : Administrator Operations : Delete " + disp_conf_type + " Confirmation </font>\n");
 
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/editConfig.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/editConfig.template
index 838a3dd74..ff52f90d9 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/editConfig.template
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/editConfig.template
@@ -64,7 +64,6 @@ String.prototype.escapeEntry = function () {
    return this.replace(/\"/g,'&dbquote').replace(/\'/g,'&singlequote').replace(/</g,'&lessthan').replace(/>/g, '&greaterthan');
 };
 
-var disp_conf_type = conf_type.replace(/_/g, " ").substring(0, conf_type.length -1);
 document.write("<font face=\"PrimaSans BT, Verdana, sans-serif\" size=\"+1\">"+
                "<a href=\""+uri0+"\">Main Menu</a> : Administrator Operations : " + disp_conf_type + " Configuration </font>\n");
 
@@ -211,21 +210,23 @@ function doDelete() {
 
     document.write("</form>\n");
 
-    document.write("<td align=left>\n");
-    document.write("<form name=deleteConfig method=POST onSubmit=\"return doDelete(this);\">\n");
-    document.write("<input type=hidden name=query value=\"op=confirm_delete_config\">");
-    document.write("<input type=hidden name=pname value=\"" + conf_name + "\">");
-    document.write("<input type=hidden name=ptype value=\"" + conf_type + "\">");
-    document.write("<input type=hidden name=pvalues value=\"" + conf_values.escapeEntry() + "\">");
-    document.write("<input type=hidden name=pstate value=\"" + conf_state + "\">");
-    document.write("<input TYPE=hidden NAME=ptimestamp VALUE=\"" + conf_tstamp + "\">");
-    if ((conf_state == "Disabled")|| (agent_must_approve != "true")) {
-        document.write("<input TYPE=submit VALUE=\"Delete\">");
-    } else {
-        document.write("<input TYPE=submit VALUE=\"Delete\" disabled=disabled>");
+    if (conf_type != "Generals") {
+        document.write("<td align=left>\n");
+        document.write("<form name=deleteConfig method=POST onSubmit=\"return doDelete(this);\">\n");
+        document.write("<input type=hidden name=query value=\"op=confirm_delete_config\">");
+        document.write("<input type=hidden name=pname value=\"" + conf_name + "\">");
+        document.write("<input type=hidden name=ptype value=\"" + conf_type + "\">");
+        document.write("<input type=hidden name=pvalues value=\"" + conf_values.escapeEntry() + "\">");
+        document.write("<input type=hidden name=pstate value=\"" + conf_state + "\">");
+        document.write("<input TYPE=hidden NAME=ptimestamp VALUE=\"" + conf_tstamp + "\">");
+        if ((conf_state == "Disabled")|| (agent_must_approve != "true")) {
+            document.write("<input TYPE=submit VALUE=\"Delete\">");
+        } else {
+            document.write("<input TYPE=submit VALUE=\"Delete\" disabled=disabled>");
+        }
+        document.write("</form>");
+        document.write("</td>\n");
     }
-    document.write("</form>");
-    document.write("</td>\n");
     document.write("</tr>\n");
     document.write("</table>\n");
 
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/selectConfig.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/selectConfig.template
index d8e5eb506..c28f03efe 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/selectConfig.template
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/selectConfig.template
@@ -52,7 +52,6 @@ if (typeof(uriBase) == "undefined") {
     uri0 += uriBase;
 }
 
-var disp_conf_type = conf_type.replace(/_/g, " ").substring(0, conf_type.length -1);
 document.write("<font face=\"PrimaSans BT, Verdana, sans-serif\" size=\"+1\">"+
                "<a href=\""+uri0+"\">Main Menu</a> : Administrator Operations : " + disp_conf_type + " Configuration </font>\n");
 
@@ -102,7 +101,7 @@ function doCancel() {
 
 
     document.write("<table BORDER=0 CELLSPACING=2 CELLPADDING=0 width=100%>\n");
-    document.write("<tr bgcolor=#e5e5e5> <p>  Use this form to add or modify " + disp_conf_type.toLowerCase() + "s.  <br> Either select an item " + 
+    document.write("<tr bgcolor=#e5e5e5> <p>  Use this form to add or modify " + conf_type.replace(/_/g, " ").toLowerCase() + ".  <br> Either select an item " + 
          " to edit in the drop-down box below and click \"Edit\", <br> or fill in the name of a new " + disp_conf_type.toLowerCase() + 
          " and click the \"Add\" button.</p></tr>");