Author: gmazza
Date: Thu Dec 26 01:38:19 2013
New Revision: 1553436
URL: http://svn.apache.org/r1553436
Log:
ROL-1616 Input fields not emptied after creating a new user (partial solution),
patch by Gaurav Saini; Upgrade from Lucene 4.4 to 4.6.
Modified:
roller/trunk/app/pom.xml
roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/CreateUser.jsp
Modified: roller/trunk/app/pom.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/app/pom.xml?rev=1553436&r1=1553435&r2=1553436&view=diff
==============================================================================
--- roller/trunk/app/pom.xml (original)
+++ roller/trunk/app/pom.xml Thu Dec 26 01:38:19 2013
@@ -22,7 +22,7 @@
<testThemesDir>${project.build.testOutputDirectory}${file.separator}themes</testThemesDir>
<testIndexDir>${project.build.testOutputDirectory}${file.separator}index</testIndexDir>
<testPlanetCache>${project.build.testOutputDirectory}${file.separator}planetcache</testPlanetCache>
- <lucene.version>4.4.0</lucene.version>
+ <lucene.version>4.6.0</lucene.version>
<spring.version>3.2.4.RELEASE</spring.version>
<spring.security.version>3.1.4.RELEASE</spring.security.version>
</properties>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/CreateUser.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/CreateUser.jsp?rev=1553436&r1=1553435&r2=1553436&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/CreateUser.jsp
(original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/CreateUser.jsp Thu Dec
26 01:38:19 2013
@@ -25,31 +25,51 @@
<table class="formtable">
<tr>
<td class="label"><label for="userName" /><s:text
name="userSettings.username" /></label></td>
- <td class="field"><s:textfield name="bean.userName" size="30"
maxlength="30" /></td>
+ <s:if test="!actionErrors.isEmpty || !fieldErrors.isEmpty">
+ <td class="field"><s:textfield value="%{bean.userName}"
name="bean.userName" size="30" maxlength="30" /></td>
+ </s:if>
+ <s:else>
+ <td class="field"><s:textfield value="" name="bean.userName"
size="30" maxlength="30" /></td>
+ </s:else>
<td class="description"><s:text name="userAdmin.tip.userName"
/></td>
</tr>
<tr>
<td class="label"><label for="passwordText" /><s:text
name="userSettings.password" /></label></td>
- <td class="field"><s:password name="bean.password" size="20"
maxlength="20" /></td>
+ <td class="field"><s:password value="" name="bean.password"
size="20" maxlength="20" /></td>
<td class="description"><s:text name="userAdmin.tip.password"
/></td>
</tr>
<tr>
<td class="label"><label for="screenName" /><s:text
name="userSettings.screenname" /></label></td>
- <td class="field"><s:textfield name="bean.screenName" size="30"
maxlength="30" /></td>
+ <s:if test="!actionErrors.isEmpty || !fieldErrors.isEmpty">
+ <td class="field"><s:textfield value="%{bean.screenName}"
name="bean.screenName" size="30" maxlength="30" /></td>
+ </s:if>
+ <s:else>
+ <td class="field"><s:textfield value="" name="bean.screenName"
size="30" maxlength="30" /></td>
+ </s:else>
<td class="description"><s:text name="userAdmin.tip.screenName"
/></td>
</tr>
<tr>
<td class="label"><label for="fullName" /><s:text
name="userSettings.fullname" /></label></td>
- <td class="field"><s:textfield name="bean.fullName" size="30"
maxlength="30" /></td>
+ <s:if test="!actionErrors.isEmpty || !fieldErrors.isEmpty">
+ <td class="field"><s:textfield value="%{bean.fullName}"
name="bean.fullName" size="30" maxlength="30" /></td>
+ </s:if>
+ <s:else>
+ <td class="field"><s:textfield value="" name="bean.fullName"
size="30" maxlength="30" /></td>
+ </s:else>
<td class="description"><s:text name="userAdmin.tip.fullName"
/></td>
</tr>
<tr>
<td class="label"><label for="emailAddress" /><s:text
name="userSettings.email" /></label></td>
- <td class="field"><s:textfield name="bean.emailAddress" size="40"
maxlength="40" /></td>
+ <s:if test="!actionErrors.isEmpty || !fieldErrors.isEmpty">
+ <td class="field"><s:textfield value="%{bean.emailAddress}"
name="bean.emailAddress" size="30" maxlength="30" /></td>
+ </s:if>
+ <s:else>
+ <td class="field"><s:textfield value=""
name="bean.emailAddress" size="30" maxlength="30" /></td>
+ </s:else>
<td class="description"><s:text name="userAdmin.tip.email" /></td>
</tr>
