portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject svn commit: r1816779 - in /portals/jetspeed-2/applications/j2-admin/trunk/src/main: java/org/apache/jetspeed/portlets/security/ resources/org/apache/jetspeed/portlets/security/ webapp/WEB-INF/security/chgpwd/
Date Thu, 30 Nov 2017 23:50:41 GMT
Author: taylor
Date: Thu Nov 30 23:50:41 2017
New Revision: 1816779

URL: http://svn.apache.org/viewvc?rev=1816779&view=rev
Log:
JS2-1361: Improve width of some input fields, better format error messages, and fix bug in
updating of credentials

Modified:
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet.java
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet$NewPrincipalPanel.html
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet$NewUserPrincipalPanel.html
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet$PrincipalAttributesPanel.html
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet$PrincipalCredentialsPanel.html
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/chgpwd/change-password.jsp

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet.java?rev=1816779&r1=1816778&r2=1816779&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet.java
(original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet.java
Thu Nov 30 23:50:41 2017
@@ -1119,6 +1119,9 @@ public class JetspeedPrincipalManagement
                 {
                     try
                     {
+                        boolean resetUpdateRequired =
+                                (getCredentialValue() != null && getCredentialValue().trim().length()
> 0) &&
+                                        (getCredentialUpdateRequired() == true);
                         UserManager manager = (UserManager) getManager();
                         PasswordCredential credential = manager
                                 .getPasswordCredential((User) getPrincipal());
@@ -1233,6 +1236,13 @@ public class JetspeedPrincipalManagement
                             }
                         }
                         manager.storePasswordCredential(credential);
+                        if (resetUpdateRequired) {
+                            // need to reset credential as core security monolith
+                            PasswordCredential credential2 = manager
+                                    .getPasswordCredential((User) getPrincipal());
+                            credential2.setUpdateRequired(true);
+                            manager.storePasswordCredential(credential2);
+                        }
                     } catch (InvalidPasswordException ipe)
                     {
                         error(ipe.getMessage());
@@ -1250,6 +1260,7 @@ public class JetspeedPrincipalManagement
                     setPrincipal(getPrincipal());
                 }
             };
+            add(new FeedbackPanel("feedback"));
             PasswordTextField credentialValueField = new PasswordTextField(
                     "credentialValue", new PropertyModel(this,
                             "credentialValue"));

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet$NewPrincipalPanel.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet%24NewPrincipalPanel.html?rev=1816779&r1=1816778&r2=1816779&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet$NewPrincipalPanel.html
(original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet$NewPrincipalPanel.html
Thu Nov 30 23:50:41 2017
@@ -24,7 +24,7 @@
 <div wicket:id="feedback"></div>
     <form wicket:id="newUserForm">	
 			<span wicket:id="userNameLabel"></span>
-			<span><input type="text" wicket:id="userName" size="20" /></span>
+			<span><input type="text" wicket:id="userName" size="50" /></span>
 			<span><input type="submit" class="portlet-form-button" wicket:id="addUser"/></span>
     </form>
 </wicket:panel>

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet$NewUserPrincipalPanel.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet%24NewUserPrincipalPanel.html?rev=1816779&r1=1816778&r2=1816779&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet$NewUserPrincipalPanel.html
(original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet$NewUserPrincipalPanel.html
Thu Nov 30 23:50:41 2017
@@ -27,13 +27,13 @@
             <tr>
                 <td class="portlet-section-alternate">New User Name: </td>
                 <td class="portlet-section-body" align="left">
-                    <input type="text" wicket:id="userName" size="20" />
+                    <input type="text" wicket:id="userName" size="50" />
                 </td>								
             </tr>
             <tr>
                 <td class="portlet-section-alternate">Password: </td>
                 <td class="portlet-section-body" align="left">
-                    <input type="password" wicket:id="password" size="20" />
+                    <input type="password" wicket:id="password" size="50" />
                 </td>								
             </tr>
 			            <tr>
@@ -45,7 +45,7 @@
             <tr>
                 <td class="portlet-section-alternate">Email Address: </td>
                 <td class="portlet-section-body" align="left">
-                    <input type="text" wicket:id="email" size="30" />
+                    <input type="text" wicket:id="email" size="50" />
                 </td>
             </tr>
             <tr>

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet$PrincipalAttributesPanel.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet%24PrincipalAttributesPanel.html?rev=1816779&r1=1816778&r2=1816779&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet$PrincipalAttributesPanel.html
(original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet$PrincipalAttributesPanel.html
Thu Nov 30 23:50:41 2017
@@ -48,13 +48,13 @@
 		<tr>
 			<td class="portlet-section-body"><span wicket:id="nameLabel"></span></td>
 			<td class="portlet-section-body"><input type="text"
-				wicket:id="userAttrName" size="20" class="portlet-form-field-label" />
+				wicket:id="userAttrName" size="50" class="portlet-form-field-label" />
 			</td>
 		</tr>
 		<tr>
 			<td class="portlet-section-body"><span wicket:id="valueLabel"></span></td>
 			<td class="portlet-section-body"><input type="text"
-				wicket:id="userAttrValue" size="20" class="portlet-form-field-label" />
+				wicket:id="userAttrValue" size="50" class="portlet-form-field-label" />
 			</td>
 		</tr>
 		<tr>

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet$PrincipalCredentialsPanel.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet%24PrincipalCredentialsPanel.html?rev=1816779&r1=1816778&r2=1816779&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet$PrincipalCredentialsPanel.html
(original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet$PrincipalCredentialsPanel.html
Thu Nov 30 23:50:41 2017
@@ -21,6 +21,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" >
 <wicket:panel>
 &nbsp;
+    <div wicket:id="feedback"></div>
     <form wicket:id="userCredentialForm">
         <table>
             <tr>

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/chgpwd/change-password.jsp
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/chgpwd/change-password.jsp?rev=1816779&r1=1816778&r2=1816779&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/chgpwd/change-password.jsp
(original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/chgpwd/change-password.jsp
Thu Nov 30 23:50:41 2017
@@ -112,8 +112,7 @@ limitations under the License.
           <c:set var="why" value="${requestScope[whyKey]}"/>
           <c:set var="requiredKey"><%=ChangePasswordPortlet.REQUIRED%></c:set>
           <c:set var="required" value="${requestScope[requiredKey]}"/>
-          <c:set var="errorMe
-    agesKey"><%=ChangePasswordPortlet.ERROR_MESSAGES%></c:set>
+          <c:set var="errorMessagesKey"><%=ChangePasswordPortlet.ERROR_MESSAGES%></c:set>
           <c:set var="errorMessages" value="${requestScope[errorMessagesKey]}"/>
 
           <c:if test="${why != null}">



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message