Revision 86:40fb83b9aa7e

View differences:

src/com/ib/ibss/controller/actions/ss112_user/IBSSRetailUserDeleteResultAction.java
23 23
import com.ib.ibss.common.utils.IBSSNavigationUtil;
24 24
import com.ib.ibss.enterprise.services.AccessConstants;
25 25
import com.ib.ibss.enterprise.services.common.SessionUserPermissionVerificationService;
26
import com.ib.ibss.enterprise.services.ss102_user_admin.constants.IBSSUserConstants;
27 26
import com.ib.ibss.enterprise.services.ss112_user.IBSSRetailUserEnquiryDeleteServices;
28 27
import com.ib.ibss.error.exception.IBSSGenericException;
29 28
import com.ib.ibss.struts.utils.IBSSControllerAction;
src/com/ib/ibss/enterprise/services/ss112_user/IBSSRetailUserEnquiryDeleteServices.java
15 15

  
16 16
import org.hibernate.Session;
17 17

  
18
import my.com.upass.MinimalUPassControllerV2;
19 18
import my.com.upass.UPassControllerV2;
20 19
import net.penril.generic.hibernate.HibernateUtils;
21 20
import net.penril.ibss.audit.log.AuditLogConstants;
22 21
import net.penril.ibss.audit.log.USER_ACTIVITY_TYTPE;
23
import net.penril.ibss.core.hibernate.IbCustProfile;
24

  
25 22
import com.ib.ibss.common.constant.AdminPermissionModeType.RIBPermission;
26 23
import com.ib.ibss.common.constant.ExceptionErrors;
27 24
import com.ib.ibss.common.utils.IBSSLogger;
......
78 75
	
79 76
	public void userDelete() throws IBSSGenericException
80 77
	{
81
		IBSSLogger.debug (c_oClass, "Entering userResetPassword");
78
		IBSSLogger.debug (c_oClass, "Entering userDelete");
82 79
		
83 80
		Long m_oLogStatus 	= AuditLogConstants.UNSUCCESSFUL;
84 81
		c_sPassword 		= getBeanMessage (IBSSUserConstants.PASS);
......
97 94
			
98 95
			RetailUserSharedServices m_oSharedServices = new RetailUserSharedServices();
99 96
			//Determine maker checker
100
			Long actionId = RIBPermission.RESET_RIB_USER_PASSWORD.getActionId();			
97
			Long actionId = RIBPermission.DELETE_RIB_USER.getActionId();			
101 98
			boolean isMakerChecker = m_oSharedServices.determineMakerChecker (actionId, getAdminActionDAO(), getIBSSessionObjects());	
102 99
			
103 100
			/* Delete User */
......
114 111
					setBeanMessage (IBSSUserConstants.JSP_TITLE, 
115 112
							ResourcesUtils.getApplicationResourceMessage ("user.user") + ": " + c_sUserAlias + " " +
116 113
							ResourcesUtils.getApplicationResourceMessage ("user.has.been.successfully") + " " +
117
							ResourcesUtils.getApplicationResourceMessage ("user.reset.desc"));
118
					c_sLogReason = "Update Successful";
114
							ResourcesUtils.getApplicationResourceMessage ("general.status.lower.deleted"));
115
					c_sLogReason = "Delete Successful";
119 116
					break;
120 117
				default:
121 118
					c_sLogReason = "Unhandled response: " + response;
122 119
					throw IBSSErrorHandler.createBusinessException (IBSSBusinessException.LOGIN, ExceptionErrors.ERR_SYSTEM_NOT_READY);
123 120
			}
124
				/* Log successful */
125
				
126 121
		}
127 122
		catch (Exception e)
128 123
		{
......
132 127
		{
133 128
			try
134 129
			{
135
				getAuditLogDAO ().logActivity (USER_ACTIVITY_TYTPE.RESET_RIB_USER_PASSWORD.getID(), 
136
						USER_ACTIVITY_TYTPE.RESET_RIB_USER_PASSWORD.getDescription(), 
130
				getAuditLogDAO ().logActivity (USER_ACTIVITY_TYTPE.DELETE_RIB_USER.getID(), 
131
						USER_ACTIVITY_TYTPE.DELETE_RIB_USER.getDescription(), 
137 132
						m_oLogStatus, 
138 133
						c_sLogReason, 
139 134
						getIBSSessionObjects ().getSessionUserAlias (), 
......
147 142
				IBSSErrorHandler.handleServiceError (e, c_oClass);
148 143
			}
149 144
		}
150
		IBSSLogger.debug (c_oClass, "Exiting userResetPassword");
145
		IBSSLogger.debug (c_oClass, "Exiting userDelete");
151 146
	}
152 147

  
153 148
}
src/com/ib/ibss/enterprise/services/ss221_settings/IBSSUpassMaintenanceResultServices.java
53 53
		{
54 54
			try
55 55
			{
56
				getAuditLogDAO ().logActivity (USER_ACTIVITY_TYTPE.EDIT_ADMIN_PROFILE.getID(), 
56
				getAuditLogDAO ().logActivity (USER_ACTIVITY_TYTPE.EDIT_UPASS_MAINTENANCE.getID(), 
57 57
						ResourcesUtils.getApplicationResourceMessage ("credential.mk.admin.upass.maintenance")
58 58
						+ " "
59 59
						+ ResourcesUtils.getApplicationResourceMessage ("credential.admin.upass.maintenance.header"),

Also available in: Unified diff