amyroh 2002/08/16 16:56:18
Modified: webapps/admin build.xml
webapps/admin/WEB-INF/classes/org/apache/webapp/admin
AttributeTag.java
webapps/admin/users group.jsp role.jsp user.jsp
Log:
Fix for bugzilla 10458 - Editing a User causes a JavaScript error because the
script is trying to focus on a hidden object - username is not guaranteed to be
focusable because if your editing an existing user, the field is hidden. (non
focusable object IE5+)
Patch submitted by Andrew Conrad - [EMAIL PROTECTED]
Revision Changes Path
1.4 +8 -1 jakarta-tomcat-catalina/webapps/admin/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.xml 13 Aug 2002 16:30:44 -0000 1.3
+++ build.xml 16 Aug 2002 23:56:18 -0000 1.4
@@ -27,6 +27,7 @@
<pathelement location="${servlet-api.jar}"/>
<pathelement location="${jsp-api.jar}"/>
<pathelement location="${struts.jar}"/>
+ <pathelement location="${commons-beanutils.jar}"/>
</path>
@@ -35,7 +36,7 @@
<!-- JDK flags -->
<available property="jdk.1.2.present" classname="java.util.HashMap" />
- <available property="jdk.1.3.present"
+ <available property="jdk.1.3.present"
classname="java.lang.reflect.Proxy" />
<available property="jdk.1.4.present" classname="java.nio.Buffer" />
@@ -67,6 +68,10 @@
<available property="struts.present"
classname="org.apache.struts.action.ActionForm"
classpath="${struts.jar}" />
+ <available property="beanutils.present"
+ classname="org.apache.commons.beanutils.PropertyUtils"
+ classpath="${common-beanutils.jar}" />
+
<!-- JAR files availability flags -->
<available property="jmx.jar.present" file="${jmx.jar}" />
@@ -74,6 +79,7 @@
<available property="servlet-api.jar.present" file="${servlet-api.jar}" />
<available property="jsp-api.jar.present" file="${jsp-api.jar}" />
<available property="struts.jar.present" file="${struts.jar}" />
+ <available property="beanutils.jar.present" file="${commons-beanutils.jar}" />
<!-- Conditional compilation flags (determined from the flags above) -->
<condition property="compile.admin">
@@ -136,6 +142,7 @@
<echo message="servlet-api.jar.present=${servlet-api.jar.present}" />
<echo message="jsp-api.jar.present=${jsp-api.jar.present}" />
<echo message="struts.jar.present=${struts.jar.present}" />
+ <echo message="beanutils.jar.present=${beanutils.jar.present}" />
<echo message="--- Optional JARs ---" />
1.2 +6 -5
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/AttributeTag.java
Index: AttributeTag.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/AttributeTag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AttributeTag.java 18 Jul 2002 16:48:21 -0000 1.1
+++ AttributeTag.java 16 Aug 2002 23:56:18 -0000 1.2
@@ -70,7 +70,8 @@
import javax.servlet.jsp.JspWriter;
import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.tagext.TagSupport;
-import org.apache.struts.util.PropertyUtils;
+import org.apache.commons.beanutils.PropertyUtils;
+
/**
1.3 +1 -1 jakarta-tomcat-catalina/webapps/admin/users/group.jsp
Index: group.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/users/group.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- group.jsp 24 Jul 2002 20:57:28 -0000 1.2
+++ group.jsp 16 Aug 2002 23:56:18 -0000 1.3
@@ -17,7 +17,7 @@
<html:errors/>
-<html:form method="POST" action="/users/saveGroup" focus="groupname">
+<html:form method="POST" action="/users/saveGroup"> <!--focus="groupname"-->
<html:hidden property="databaseName"/>
<html:hidden property="objectName"/>
1.3 +1 -1 jakarta-tomcat-catalina/webapps/admin/users/role.jsp
Index: role.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/users/role.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- role.jsp 24 Jul 2002 20:57:28 -0000 1.2
+++ role.jsp 16 Aug 2002 23:56:18 -0000 1.3
@@ -17,7 +17,7 @@
<html:errors/>
-<html:form method="POST" action="/users/saveRole" focus="rolename">
+<html:form method="POST" action="/users/saveRole"> <!--focus="rolename"-->
<html:hidden property="databaseName"/>
<html:hidden property="objectName"/>
1.3 +1 -1 jakarta-tomcat-catalina/webapps/admin/users/user.jsp
Index: user.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/users/user.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- user.jsp 24 Jul 2002 20:57:28 -0000 1.2
+++ user.jsp 16 Aug 2002 23:56:18 -0000 1.3
@@ -17,7 +17,7 @@
<html:errors/>
-<html:form method="POST" action="/users/saveUser" focus="username">
+<html:form method="POST" action="/users/saveUser"> <!--focus="username"-->
<html:hidden property="databaseName"/>
<html:hidden property="objectName"/>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
