Revision 72:dde60018a086

View differences:

WebContent/WEB-INF/config/ss102_user_admin/validation.xml
214 214
   <field depends="required" property="userGroup">
215 215
    <arg0 key="user.group"/>
216 216
   </field>
217
   <field depends="required, minlength, password" property="pass">
217
   <field depends="required" property="pass">
218 218
    <arg0 key="user.password"/>
219 219
    <arg1 key="${var:minlength}" name="minlength" resource="false"/>
220 220
    <var>
......
227 227
     <var-value>12</var-value>
228 228
    </var>
229 229
   </field>
230
   <field depends="required, minlentgh, password" property="confirmPass">
230
   <field depends="required" property="confirmPass">
231 231
    <arg0 key="user.confirm.password"/>
232 232
    <arg1 key="${var:minlength}" name="minlength" resource="false"/>
233 233
    <var>
......
304 304
   </field>
305 305
  </form>
306 306
  <form name="resetPassValidation">
307
   <field depends="required, minlength, password" property="pass">
307
   <field depends="required" property="pass">
308 308
    <arg0 key="user.new.password"/>
309 309
    <arg1 key="${var:minlength}" name="minlength" resource="false"/>
310 310
    <var>
......
317 317
     <var-value>12</var-value>
318 318
    </var>
319 319
   </field>
320
   <field depends="required, minlength, password" property="confirmPass">
320
   <field depends="required" property="confirmPass">
321 321
    <arg0 key="user.confirm.password"/>
322 322
    <arg1 key="${var:minlength}" name="minlength" resource="false"/>
323 323
    <var>
WebContent/WEB-INF/config/ss112_user/validation.xml
29 29
			</field>
30 30
		</form>
31 31
		<form name="ss112UserResetPassValidation">
32
		    <field depends="required, minlength, password" property="pass">
32
		    <field depends="required" property="pass">
33 33
			     <msg key="errors.minlength" name="minlength"/>
34 34
			    <arg0 key="user.new.password"/>
35 35
			    <arg1 key="${var:minlength}" name="minlength" resource="false"/>
......
38 38
			     <var-value>8</var-value>
39 39
			    </var>
40 40
			</field>
41
			<field depends="required, minlength, password" property="confirmPass">
41
			<field depends="required" property="confirmPass">
42 42
			     <msg key="errors.minlength" name="minlength"/>
43 43
			    <arg0 key="user.confirm.password"/>
44 44
			    <arg1 key="${var:minlength}" name="minlength" resource="false"/>
WebContent/jsp/ss102_user_admin/ibssUserResetPass.jsp
79 79
    <td><htmlEL:password autocomplete="off"  property="pass" name="ibssUserForm" 
80 80
    onkeyup="testPassword(document.forms.ibssUserForm.pass.value)" /></td>
81 81
    
82
    <td><span style="font-size: 11px;">Password Strength : </span><span id="passCheck" class="textColor0"></span><br>
83
    <span id="passwordStrength" class="strength0"></span></td>
84 82
  </tr>
85 83
  <tr>
86 84
    <td>&nbsp;</td>
......
105 103
			<bean:message key="general.button.back" />
106 104
		</htmlEL:submit>
107 105
	</div>
108
</htmlEL:form>
109

  
110

  
111

  
112
<style>
113

  
114
#passwordStrength
115
{
116
	height:3px;
117
	display:block;
118
	float:left;
119
}
120

  
121
</style>
106
</htmlEL:form>
WebContent/jsp/ss102_user_admin/ibssUserSearch.jsp
19 19
		<tr><td height="30" colspan="4">&nbsp;</td></tr>
20 20
		<tr>
21 21
			<td>&nbsp;</td>
22
			<td><bean:message key="user.alias"/></td>
22
			<td><bean:message key="user.id"/></td>
23 23
			<td align="left">:</td>
24 24
			<td><htmlEL:text name="ibssUserForm" property="searchUserAlias" maxlength="64" size="22"/></td>
25 25
		</tr>
WebContent/jsp/ss102_user_admin/ibssUserSearchResult.jsp
29 29
	<table class="tabularData" cellspacing="0">
30 30
  <thead>
31 31
    <tr>
32
      <th height="34"><bean:message key="user.id"/></th>
33
      <th><bean:message key="user.alias"/></th>
32
      <th height="34"><bean:message key="general.id"/></th>
33
      <th><bean:message key="user.id"/></th>
34 34
      <th><bean:message key="user.name"/></th>
35 35
      <th><bean:message key="user.status"/></th>
36 36
      <th><bean:message key="user.updated.date"/></th>
WebContent/jsp/ss112_user/ibssRetailUserDetails.jsp
34 34
		</tr>
35 35
		<tr>
36 36
			<td>&nbsp;</td>
37
			<td><bean:message key="user.id" />:</td>
37
			<td><bean:message key="general.id" />:</td>
38 38
			<td colspan="2"><strong><c:out
39 39
						value="${detailBean.map.userID}" /> </strong></td>
40 40
			<td colspan="2">&nbsp;</td>
41 41
		</tr>
42 42
		<tr>
43 43
			<td>&nbsp;</td>
44
			<td><bean:message key="user.alias" />:</td>
44
			<td><bean:message key="user.id" />:</td>
45 45
			<td colspan="2"><strong><c:out
46 46
						value="${detailBean.map.userAlias}" /> </strong></td>
47 47
			<td colspan="2">&nbsp;</td>
48 48
		</tr>
49
		<tr>
49
		<%-- <tr>
50 50
			<td>&nbsp;</td>
51 51
			<td><bean:message key="user.customer.name" />:</td>
52 52
			<td colspan="2"><strong> <c:choose>
......
56 56
						<c:otherwise>-</c:otherwise>
57 57
					</c:choose> </strong></td>
58 58
			<td colspan="2">&nbsp;</td>
59
		</tr>
59
		</tr> --%>
60 60
		<tr>
61 61
			<td>&nbsp;</td>
62 62
			<td><bean:message key="user.status" />:</td>
WebContent/jsp/ss112_user/ibssRetailUserEnquiry.jsp
33 33
	<table class="tabularData" cellspacing="0">
34 34
  <thead>
35 35
    <tr>
36
      <th height="34"><bean:message key="user.id"/></th>
37
      <th><bean:message key="user.alias"/></th>
38
      <th><bean:message key="user.customer.name"/></th>
36
      <th height="34"><bean:message key="general.id"/></th>
37
      <th><bean:message key="user.id"/></th>
38
     <%--  <th><bean:message key="user.customer.name"/></th> --%>
39 39
      <th><bean:message key="user.status"/></th>
40 40
      <th><bean:message key="user.application"/></th>
41 41
      <%-- <th><bean:message key="user.authentication.mode"/></th> --%>
......
74 74
			<td>
75 75
				<c:out value="${userBean.map.userAlias}"/>
76 76
			</td>
77
			<td>
77
			<%-- <td>
78 78
				<c:choose>
79 79
		    		<c:when test="${not empty userBean.map.userName}">
80 80
		    			<c:out value="${userBean.map.userName}"></c:out>
81 81
		    		</c:when>
82 82
		    		<c:otherwise>-</c:otherwise>
83 83
		    	</c:choose>
84
			</td>
84
			</td> --%>
85 85
			<td>
86 86
				<c:choose>
87 87
		    		<c:when test="${not empty userBean.map.userStatus}">
WebContent/jsp/ss112_user/ibssRetailUserResetPass.jsp
31 31
  </tr>
32 32
  <tr>
33 33
    <td width="69">&nbsp;</td>
34
    <td><bean:message key="user.id"/>:</td>
34
    <td><bean:message key="general.id"/>:</td>
35 35
    <td colspan="2"><strong><c:out value="${detailBean.map.userID}"/></strong></td>
36 36
    <td>&nbsp;</td>
37 37
    </tr>
38 38
     <tr>
39 39
    <td width="69">&nbsp;</td>
40
    <td><bean:message key="user.alias"/>:</td>
40
    <td><bean:message key="user.id"/>:</td>
41 41
    <td colspan="2"><strong><c:out value="${detailBean.map.userAlias}"/></strong></td>
42 42
    <td>&nbsp;</td>
43 43
    </tr>
44
  <tr>
44
 <%--  <tr>
45 45
    <td width="69">&nbsp;</td>
46 46
    <td><bean:message key="user.name"/>:</td>
47 47
    <td colspan="2"><strong>
......
53 53
    	</c:choose>
54 54
    </strong></td>
55 55
    <td>&nbsp;</td>
56
    </tr>
56
    </tr> --%>
57 57
  <tr>
58 58
    <td>&nbsp;</td>
59 59
    <td><bean:message key="user.status"/>:</td>
src/com/ib/ibss/enterprise/services/ss112_user/IBSSRetailUserEnquiryResetPassServices.java
25 25
import com.ib.ibss.common.utils.ResourcesUtils;
26 26
import com.ib.ibss.enterprise.services.IBSSEnterpriseServicesWorkspace;
27 27
import com.ib.ibss.enterprise.services.StatusConstants;
28
import com.ib.ibss.enterprise.services.ss102_user_admin.AdminSharedServices;
28 29
import com.ib.ibss.enterprise.services.ss102_user_admin.constants.IBSSUserConstants;
29 30
import com.ib.ibss.error.exception.IBSSBusinessException;
30 31
import com.ib.ibss.error.exception.IBSSGenericException;
......
95 96
			checkPasswordMatching();
96 97
			
97 98
			RetailUserSharedServices m_oSharedServices = new RetailUserSharedServices();
99
			
100
			AdminSharedServices m_oAdminService = new AdminSharedServices ();
101
			
102
			c_sLogReason = m_oAdminService.checkPasswordPattern (c_sPassword,getUPassService ());
103
			
98 104
			//Determine maker checker
99 105
			Long actionId = RIBPermission.RESET_RIB_USER_PASSWORD.getActionId();			
100 106
			boolean isMakerChecker = m_oSharedServices.determineMakerChecker (actionId, getAdminActionDAO(), getIBSSessionObjects());	

Also available in: Unified diff