Revision 96:c2afcaa3dd4b

View differences:

WebContent/jsp/ss112_user/ibssRetailUserDetails.jsp
142 142
		</htmlEL:submit>
143 143
		</c:if>
144 144
		
145
		<c:if test="${detailBean.map.userStatusKey ne 2}">
145
		<c:if test="${detailBean.map.userStatusKey eq 0}">
146 146
		<htmlEL:submit property="action" styleClass="button"
147 147
			onclick="overlay();">
148 148
			<bean:message key="general.button.suspend" />
WebContent/jsp/ss112_user/ibssRetailUserSuspendResult.jsp
20 20
  </tr>
21 21
  <tr>
22 22
    <td height="28">&nbsp;</td>
23
    <td colspan="2"><bean:write name="ibssUserForm" property="jspTitle"/></strong></td>
23
    <td colspan="2"><strong><bean:write name="ibssUserForm" property="jspTitle"/></strong></td>
24 24
    <td>&nbsp;</td>
25 25
  </tr>
26 26
  <tr>
src/com/ib/ibss/enterprise/services/ss112_user/IBSSRetailUserActivateResultServices.java
10 10
 */
11 11
package com.ib.ibss.enterprise.services.ss112_user;
12 12

  
13
import java.util.Map;
14

  
13 15
import my.com.upass.MinimalConstants;
14 16
import my.com.upass.UPassControllerV2;
15 17
import net.penril.ibss.audit.log.AuditLogConstants;
16 18
import net.penril.ibss.audit.log.USER_ACTIVITY_TYTPE;
17 19

  
20
import com.ib.ibss.common.constant.BusinessOptions;
18 21
import com.ib.ibss.common.constant.ExceptionErrors;
19 22
import com.ib.ibss.common.utils.IBSSLogger;
20 23
import com.ib.ibss.common.utils.ResourcesUtils;
......
78 81
				case MinimalConstants.ERR_SUCCESS:
79 82
					m_sLogReason = "Unlock Successful: " + m_sUserAlias;
80 83
					m_oLogStatus = AuditLogConstants.SUCCESSFUL;
84
					
85
					Map<String, String> m_mUStatusMap 	= ResourcesUtils.getBusinessOptionsResourceKey(BusinessOptions.USER_STATUS);
86
					m_oDetailBean.set(IBSSUserConstants.USER_STATE, m_mUStatusMap.get(String.valueOf(StatusConstants.UID_STATE_ACTIVE)));
87
					m_oDetailBean.set(IBSSUserConstants.USER_STATE_KEY, Long.valueOf(StatusConstants.UID_STATE_ACTIVE));
88
					getIBSSDynaBean().set(IBSSUserConstants.IBSS_USER_DETAIL, m_oDetailBean);
89
					
81 90
					break;
82 91
				case MinimalConstants.ERR_ALREADY_EXIST:
83 92
					m_sLogReason = AuditLogConstants.CREATE_ADMIN_R_ALREADY_EXIST + m_sUserAlias;
......
91 100
			}
92 101
			
93 102
			setBeanMessage (IBSSUserConstants.JSP_TITLE, 
94
					ResourcesUtils.getApplicationResourceMessage ("user.user") + ": " + m_sUserAlias + " " +
103
					ResourcesUtils.getApplicationResourceMessage ("user.user") + " " + m_sUserAlias + " " +
95 104
					ResourcesUtils.getApplicationResourceMessage ("user.success.activated"));
96 105
			
97 106
			setBeanMessage (IBSSUserConstants.USER_ID, String.valueOf (m_lUserID));			
src/com/ib/ibss/enterprise/services/ss112_user/IBSSRetailUserEnquiryEditServices.java
64 64
		
65 65
		try
66 66
		{
67
			detailBean 	= (IBSSDynaBean) getIBSSDynaBean().get(IBSSUserConstants.IBSS_USER_DETAIL);
67
			detailBean 		= (IBSSDynaBean) getIBSSDynaBean().get(IBSSUserConstants.IBSS_USER_DETAIL);
68 68
			detailMap		= (LinkedHashMap<String, String>) detailBean.get(IBSSUserConstants.USER_DETAILS_MAP);
69 69
			appId			= (String) detailBean.get (IBSSUserConstants.USER_APPLICATION_KEY);
70 70
			
src/com/ib/ibss/enterprise/services/ss112_user/IBSSRetailUserSuspendResultServices.java
11 11

  
12 12
package com.ib.ibss.enterprise.services.ss112_user;
13 13

  
14
import java.util.Map;
15

  
14 16
import my.com.upass.MinimalConstants;
15 17
import my.com.upass.UPassControllerV2;
16 18
import net.penril.ibss.audit.log.AuditLogConstants;
17 19
import net.penril.ibss.audit.log.USER_ACTIVITY_TYTPE;
18 20

  
21
import com.ib.ibss.common.constant.BusinessOptions;
19 22
import com.ib.ibss.common.constant.ExceptionErrors;
20 23
import com.ib.ibss.common.utils.IBSSLogger;
21 24
import com.ib.ibss.common.utils.ResourcesUtils;
......
73 76
			
74 77
			Long uerID = (Long) detailBean.get (IBSSUserConstants.USER_ID);
75 78
			userAlias  = (String) detailBean.get (IBSSUserConstants.USER_ALIAS);
76
			System.out.println("userAlias = "+userAlias);
77 79
			
78 80
			UPassControllerV2 upass = new UPassControllerV2();
79 81

  
......
84 86
				case MinimalConstants.ERR_SUCCESS:
85 87
					logReason = "Suspend Successful: " + userAlias;
86 88
					logStatus = AuditLogConstants.SUCCESSFUL;
89
					
90
					Map<String, String> m_mUStatusMap 	= ResourcesUtils.getBusinessOptionsResourceKey(BusinessOptions.USER_STATUS);
91
					detailBean.set(IBSSUserConstants.USER_STATE, m_mUStatusMap.get(String.valueOf(StatusConstants.UID_STATE_LOCKED)));
92
					detailBean.set(IBSSUserConstants.USER_STATE_KEY, Long.valueOf(StatusConstants.UID_STATE_LOCKED));
93
					getIBSSDynaBean().set(IBSSUserConstants.IBSS_USER_DETAIL, detailBean);
87 94
					break;
88 95
				case MinimalConstants.ERR_ALREADY_EXIST:
89 96
					logReason = AuditLogConstants.CREATE_ADMIN_R_ALREADY_EXIST + userAlias;
......
99 106
			setBeanMessage (IBSSUserConstants.USER_ID, String.valueOf (uerID));
100 107
		
101 108
			setBeanMessage (IBSSUserConstants.JSP_TITLE, 
102
					ResourcesUtils.getApplicationResourceMessage ("user.user") + ": " + userAlias + " " +
109
					ResourcesUtils.getApplicationResourceMessage ("user.user") + " " + userAlias + " " +
103 110
					ResourcesUtils.getApplicationResourceMessage ("user.has.been.successfully") + " " +
104 111
					ResourcesUtils.getApplicationResourceMessage ("user.suspend.desc"));
105 112
		}
src/com/ib/ibss/enterprise/services/ss112_user/IBSSRetailUserUnlockResultServices.java
10 10
 */
11 11
package com.ib.ibss.enterprise.services.ss112_user;
12 12

  
13
import java.util.Map;
14

  
13 15
import my.com.upass.MinimalConstants;
14 16
import my.com.upass.UPassControllerV2;
15 17
import net.penril.ibss.audit.log.AuditLogConstants;
16 18
import net.penril.ibss.audit.log.USER_ACTIVITY_TYTPE;
17 19

  
20
import com.ib.ibss.common.constant.BusinessOptions;
18 21
import com.ib.ibss.common.constant.ExceptionErrors;
19 22
import com.ib.ibss.common.utils.IBSSLogger;
20 23
import com.ib.ibss.common.utils.ResourcesUtils;
......
72 75
			long m_lUserStatus = (Long) m_oDetailBean.get (IBSSUserConstants.USER_STATE_KEY) ;
73 76
			m_sUserAlias = (String) m_oDetailBean.get (IBSSUserConstants.USER_ALIAS);
74 77
			Long m_lUserID = (Long) m_oDetailBean.get (IBSSUserConstants.USER_ID);
75
//			String m_sUserName = (String) m_oDetailBean.get (IBSSUserConstants.USER_NAME);
76
//			String m_TACphoneNum = (String) m_oDetailBean.get (IBSSUserConstants.USER_TAC_PHONE);
77 78
			
78 79
			String m_sJspTitleResource="";
79 80
			if(m_lUserStatus == IBSSUserConstants.USER_STATUS_LOCKED) //password lock
......
98 99
				case MinimalConstants.ERR_SUCCESS:
99 100
					m_sLogReason = "Unlock Successful: " + m_sUserAlias;
100 101
					m_oLogStatus = AuditLogConstants.SUCCESSFUL;
102
					
103
					Map<String, String> m_mUStatusMap 	= ResourcesUtils.getBusinessOptionsResourceKey(BusinessOptions.USER_STATUS);
104
					m_oDetailBean.set(IBSSUserConstants.USER_STATE, m_mUStatusMap.get(String.valueOf(StatusConstants.UID_STATE_ACTIVE)));
105
					m_oDetailBean.set(IBSSUserConstants.USER_STATE_KEY, Long.valueOf(StatusConstants.UID_STATE_ACTIVE));
106
					getIBSSDynaBean().set(IBSSUserConstants.IBSS_USER_DETAIL, m_oDetailBean);
101 107
					break;
102 108
				case MinimalConstants.ERR_ALREADY_EXIST:
103 109
					m_sLogReason = AuditLogConstants.CREATE_ADMIN_R_ALREADY_EXIST + m_sUserAlias;
......
111 117
			}
112 118
			
113 119
			setBeanMessage (IBSSUserConstants.JSP_TITLE, 
114
					ResourcesUtils.getApplicationResourceMessage ("user.user") + ": " + m_sUserAlias + " " +
120
					ResourcesUtils.getApplicationResourceMessage ("user.user") + " " + m_sUserAlias + " " +
115 121
					ResourcesUtils.getApplicationResourceMessage ("user.has.been.successfully") + " " +
116 122
					ResourcesUtils.getApplicationResourceMessage (m_sJspTitleResource));
117 123
			

Also available in: Unified diff