Revision 97:ac197890b575

View differences:

WebContent/jsp/ss112_user/ibssRetailUserDeleteConfirm.jsp
6 6
	property="ibssUserDetailBean" />
7 7

  
8 8
<h3 class="title"><strong><c:out value="${sessionScope.displayDesc}"/> - Delete Confirmation</strong></h3>
9
<htmlEL:form action="/ss112/delUserResult.do">
10 9
<table class="tabularForm" width="517" border="1">
11 10
  <tr>
12
    <td width="96">&nbsp;</td>
13
    <td width="264">&nbsp;</td>
14
    <td width="146">&nbsp;</td>
15
    <td width="86">&nbsp;</td>
11
    <td width="75">&nbsp;</td>
12
    <td class="success" width="140"><strong><bean:message key="user.desc.confirmation"/></strong></td>
13
    <td width="93">&nbsp;</td>
14
    <td width="47">&nbsp;</td>
16 15
  </tr>
17
    <tr>
18
		<td>&nbsp;</td>
19
		<td><label id='label1'><bean:message key="user.id"/>: 
20
			<strong><c:out value="${detailBean.map.userAlias}"/></strong>
21
			<bean:message key="user.will.be"/> 
22
			</label><strong><bean:message key="user.deleted"/></strong>.</td>
23
		<td>&nbsp;</td>
24
	</tr>
25 16
  <tr>
26
    <td>&nbsp;</td>
27
    <td>&nbsp;</td>
28
    <td colspan="2">
17
    <td height="28">&nbsp;</td>
18
    <td colspan="2"><bean:message key="user.user"/>
19
    <strong><c:out value="${detailBean.map.userAlias}"/></strong>
20
    <bean:message key="general.status.delete.confirm"/>.
21
    </td>
22
  </tr>
23
</table>
24
<htmlEL:form action="/ss112/delUserResult.do">
25
 <div class="floatRight">
29 26
      	<htmlEL:cancel property="action"  styleClass="button" onclick="overlay();">
30 27
			<bean:message key="general.button.back"/>
31 28
		</htmlEL:cancel>
32 29
		<htmlEL:submit property="action"  styleClass="button" onclick="overlay();">
33 30
			<bean:message key="general.button.confirm"/>
34 31
		</htmlEL:submit>
35
    </td>
36
  </tr>
37
</table>
32
 </div>
38 33
</htmlEL:form>
src/com/ib/ibss/enterprise/services/ss112_user/IBSSRetailUserEnquiryDeleteServices.java
19 19
import net.penril.generic.hibernate.HibernateUtils;
20 20
import net.penril.ibss.audit.log.AuditLogConstants;
21 21
import net.penril.ibss.audit.log.USER_ACTIVITY_TYTPE;
22
import com.ib.ibss.common.constant.AdminPermissionModeType.RIBPermission;
23 22
import com.ib.ibss.common.constant.ExceptionErrors;
24 23
import com.ib.ibss.common.utils.IBSSLogger;
25 24
import com.ib.ibss.common.utils.ResourcesUtils;
......
91 90
		
92 91
		try
93 92
		{
94
			
95
			RetailUserSharedServices m_oSharedServices = new RetailUserSharedServices();
96
			//Determine maker checker
97
			Long actionId = RIBPermission.DELETE_RIB_USER.getActionId();			
98
			boolean isMakerChecker = m_oSharedServices.determineMakerChecker (actionId, getAdminActionDAO(), getIBSSessionObjects());	
99
			
100 93
			/* Delete User */
101 94
			UPassControllerV2 upass = new UPassControllerV2();
102 95
			session = HibernateUtils.currentSession();
......
128 121
			try
129 122
			{
130 123
				getAuditLogDAO ().logActivity (USER_ACTIVITY_TYTPE.DELETE_RIB_USER.getID(), 
131
						USER_ACTIVITY_TYTPE.DELETE_RIB_USER.getDescription(), 
124
						USER_ACTIVITY_TYTPE.DELETE_RIB_USER.getDescription() + ": " + c_sUserAlias, 
132 125
						m_oLogStatus, 
133 126
						c_sLogReason, 
134 127
						getIBSSessionObjects ().getSessionUserAlias (), 

Also available in: Unified diff