yoavs 2004/09/17 12:52:04
Modified: webapps/docs Tag: TOMCAT_5_0 changelog.xml
webapps/manager/WEB-INF/classes/org/apache/catalina/manager
Tag: TOMCAT_5_0 HTMLManagerServlet.java
Log:
Bugzilla 29485: MessageFormat requires double-quoting of single quotes.
Revision Changes Path
No revision
No revision
1.70.2.34 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.70.2.33
retrieving revision 1.70.2.34
diff -u -r1.70.2.33 -r1.70.2.34
--- changelog.xml 15 Sep 2004 18:40:38 -0000 1.70.2.33
+++ changelog.xml 17 Sep 2004 19:52:04 -0000 1.70.2.34
@@ -84,6 +84,9 @@
<update>
Added JavaScript confirmation for "dangerous" manager tasks. (yoavs)
</update>
+ <fix>
+ <bug>29485</bug>: Added JavaScript confirmation prompts to HTML Manager
actions. (yoavs)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
No revision
No revision
1.12.2.2 +6 -6
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java
Index: HTMLManagerServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java,v
retrieving revision 1.12.2.1
retrieving revision 1.12.2.2
diff -u -r1.12.2.1 -r1.12.2.2
--- HTMLManagerServlet.java 2 Sep 2004 19:18:07 -0000 1.12.2.1
+++ HTMLManagerServlet.java 17 Sep 2004 19:52:04 -0000 1.12.2.2
@@ -593,9 +593,9 @@
" <td class=\"row-left\">\n" +
" <small>\n" +
" {1} \n" +
- " <a href=\"{2}\" onclick=\"return(confirm('Are you
sure?'))\">{3}</a> \n" +
- " <a href=\"{4}\" onclick=\"return(confirm('Are you
sure?'))\">{5}</a> \n" +
- " <a href=\"{6}\" onclick=\"return(confirm('Are you
sure?'))\">{7}</a> \n" +
+ " <a href=\"{2}\" onclick=\"return(confirm(''Are you
sure?''))\">{3}</a> \n" +
+ " <a href=\"{4}\" onclick=\"return(confirm(''Are you
sure?''))\">{5}</a> \n" +
+ " <a href=\"{6}\" onclick=\"return(confirm(''Are you
sure?''))\">{7}</a> \n" +
" </small>\n" +
" </td>\n" +
"</tr>\n";
@@ -603,10 +603,10 @@
private static final String STOPPED_APPS_ROW_BUTTON_SECTION =
" <td class=\"row-left\">\n" +
" <small>\n" +
- " <a href=\"{0}\" onclick=\"return(confirm('Are you
sure?'))\">{1}</a> \n" +
+ " <a href=\"{0}\" onclick=\"return(confirm(''Are you
sure?''))\">{1}</a> \n" +
" {3} \n" +
" {5} \n" +
- " <a href=\"{6}\" onclick=\"return(confirm('Are you
sure?'))\">{7}</a> \n" +
+ " <a href=\"{6}\" onclick=\"return(confirm(''Are you
sure?''))\">{7}</a> \n" +
" </small>\n" +
" </td>\n" +
"</tr>\n";
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
