Revision 41:48535d43fbf7

View differences:

WebContent/WEB-INF/config/ss223_application/form-beans.xml
7 7
			type="org.apache.struts.validator.DynaValidatorForm">
8 8
			<form-property name="appUserViewBean"
9 9
				type="org.apache.commons.beanutils.DynaBean" />
10
			<form-property name="appUserDetailBean"
10
			<form-property name="appUserDetailsBean"
11
				type="org.apache.commons.beanutils.DynaBean" />
12
			<form-property name="appUserBean"
11 13
				type="org.apache.commons.beanutils.DynaBean" />
12 14
			
13 15
			<form-property name="clientAppList" type="java.util.List" />
16
			<form-property name="userId" type="java.lang.String" />
14 17
			<form-property name="userAlias" type="java.lang.String" />
15 18
			<form-property name="userDescription" type="java.lang.String" />
16 19
			<form-property name="selectedAppId" type="java.lang.Integer" />
WebContent/WEB-INF/config/ss223_application/tiles-defs.xml
23 23
		<put name="body" value="/jsp/ss223_application/ibssAppUserDetails.jsp" />
24 24
	</definition>
25 25
	<definition name=".ibss.app.user.edit" extends=".ibss.content.template">
26
		<put name="body" value="/jsp/ss223_application/ibssAppUserEdit.jsp" />
26
		<put name="body" value="/jsp/ss223_application/ibssAppUserEditDetails.jsp" />
27 27
	</definition>
28 28
	<definition name=".ibss.app.user.edit.confirm" extends=".ibss.content.template">
29 29
		<put name="body" value="/jsp/ss223_application/ibssAppUserEditConfirm.jsp" />
......
34 34
	<definition name=".ibss.app.user.enquiry.main" extends=".ibss.content.template">
35 35
		<put name="body" value="/jsp/ss223_application/ibssAppUserEnquiry.jsp" />
36 36
	</definition>
37
	<definition name=".ibss.app.user.enquiry.no.groups" extends=".ibss.content.template">
38
		<put name="body" value="/jsp/ss223_application/ibssAppUserEnquiryNoGroups.jsp" />
37
	<definition name=".ibss.app.user.enquiry.no.users" extends=".ibss.content.template">
38
		<put name="body" value="/jsp/ss223_application/ibssAppUserEnquiryNoUsers.jsp" />
39 39
	</definition>
40 40
	
41 41
	<definition name=".ibss.app.user.print" extends=".ibss.popup.print.template">
WebContent/WEB-INF/config/ss223_application/view-beans.xml
26 26
			<form-property name="indexNo" type="java.lang.String" />
27 27
		</form-bean>
28 28

  
29
		<form-bean name="appUserDetailBean" type="org.apache.struts.action.DynaActionForm">
29
		<form-bean name="appUserDetailsBean" type="org.apache.struts.action.DynaActionForm">
30 30
			<form-property name="userId" type="java.lang.Long" />
31 31
			<form-property name="userDescription" type="java.lang.String" />
32 32
			<form-property name="userAlias" type="java.lang.String" />
WebContent/jsp/ss223_application/ibssAppUserDetails.jsp
4 4
<%@ taglib uri="/WEB-INF/tld/struts-logic-el" prefix="logicEL" %>
5 5
<%@ taglib uri="/WEB-INF/tld/c" prefix="c" %>
6 6

  
7
<bean:define id="detailBean" name="appUserForm" property="appUserDetailBean" />
7
<bean:define id="detailBean" name="appUserForm" property="appUserDetailsBean" />
8 8
<bean:define id="viewBean" name="appUserForm" property="appUserViewBean" />
9 9

  
10 10
<h3 class="title"><strong><c:out value="${sessionScope.displayDesc}"/> - <bean:message key="navigation.details.displayDesc.details" /></strong></h3>
......
93 93
	  	<htmlEL:submit property="action" styleClass="button" onclick="overlay();">
94 94
			<bean:message key="general.button.back"/>						
95 95
		</htmlEL:submit>
96
		<c:if test="${appUserForm.map.hasAppUserEditAccess eq true}">
96
		<c:if test="${appUserForm.map.hasAppEditAccess eq true}">
97 97
		<htmlEL:hidden property="userId" name="detailBean" value="${detailBean.map.userId}"></htmlEL:hidden>
98 98
	  	<htmlEL:submit property="action" styleClass="button" onclick="overlay();">
99 99
			<bean:message key="general.button.edit"/>						
100 100
		</htmlEL:submit>
101 101
		</c:if>
102
		<c:if test="${appUserForm.map.hasAppUserDeleteAccess eq true}">
102
		<c:if test="${appUserForm.map.hasAppDeleteAccess eq true}">
103 103
		<htmlEL:hidden property="userId" name="detailBean" value="${detailBean.map.userId}"></htmlEL:hidden>
104 104
		<htmlEL:submit property="action" styleClass="button" onclick="overlay();">
105 105
			<bean:message key="general.button.delete"/>						
WebContent/jsp/ss223_application/ibssAppUserEditDetails.jsp
5 5
<%@ taglib uri="/WEB-INF/tld/c" prefix="c" %>
6 6
<%@ taglib uri="/WEB-INF/tld/struts-html" prefix="html"%>
7 7

  
8
<bean:define id="detailBean" name="appUserForm" property="appUserDetailBean"/>
8
<bean:define id="detailBean" name="appUserForm" property="appUserDetailsBean"/>
9 9
<bean:define id="viewBean" name="appUserForm" property="appUserViewBean"/>
10 10

  
11 11
<h3 class="title"><strong><c:out value="${sessionScope.displayDesc}"/> - <bean:message key="navigation.details.displayDesc.edit" /></strong></h3>
......
24 24

  
25 25
</tr>
26 26
</table>
27
<htmlEL:form action="/ss223/appUserEditConfirm.do">
27
<htmlEL:form action="/ss223/appUserEditResult.do">
28 28
<table class="tabularForm" width="517" height="97" border="1">
29 29
  <tr>
30 30
    <td width="69">&nbsp;</td>
WebContent/jsp/ss223_application/ibssAppUserEditResult.jsp
31 31
  </tr>
32 32
</table>
33 33

  
34
<htmlEL:form action="/ss2233/appUserDetails.do">
34
<htmlEL:form action="/ss223/appUserDetails.do">
35 35
	<div class="floatRight">
36 36
		<htmlEL:submit property="action"><bean:message key="general.button.back"/></htmlEL:submit>
37 37
	</div>
WebContent/jsp/ss223_application/ibssAppUserEnquiry.jsp
23 23
</tr>
24 24
</table>
25 25
<c:if test="${pagination.totalPageNumber gt 1}">
26
	<jsp:include flush="true" page="/jsp/ss103_user/ibssAppUserEnquiryPagination.jsp"></jsp:include>
26
	<jsp:include flush="true" page="/jsp/ss223_application/ibssAppUserEnquiryPagination.jsp"></jsp:include>
27 27
</c:if>
28 28

  
29 29
<beanEL:size collection="${viewBean.map.userList}" id="userListSize"/>
......
34 34
  <thead>
35 35
    <tr>
36 36
      <th height="34"><bean:message key="appuser.user.id"/></th>
37
      <bean:message key="appuser.user.alias"/></th>
37
      <th><bean:message key="appuser.user.alias"/></th>
38 38
      <th><bean:message key="appuser.application.name"/></th>
39 39
      <th><bean:message key="appuser.created.date"/></th>
40 40
      <th>&nbsp;</th>
......
57 57
		<bean:define id="userID" name="userBean" property="userId" />
58 58
<%
59 59
			HashMap paramsName = new HashMap();
60
			paramsName.put("userID", userID);
60
			paramsName.put("userId", userID);
61 61
			paramsName.put("SECONDARY_TOKEN", request.getSession().getAttribute("PRIMARY_TOKEN"));
62 62
			pageContext.setAttribute("paramsName", paramsName);
63 63
%>
......
104 104
</c:choose>
105 105

  
106 106
<c:if test="${pagination.totalPageNumber gt 1}">
107
	<jsp:include flush="true" page="/jsp/ss103_user/ibssAppUserEnquiryPagination.jsp"></jsp:include>
107
	<jsp:include flush="true" page="/jsp/ss223_application/ibssAppUserEnquiryPagination.jsp"></jsp:include>
108 108
</c:if>
109 109

  
110
<c:if test="${ibssuserForm.map.hasAppUserCreateAccess eq true}">
110
<c:if test="${appUserForm.map.hasAppCreateAccess eq true}">
111 111
<div class="floatRight">
112 112
	<htmlEL:submit property="action"><bean:message key="general.button.create"/></htmlEL:submit>
113 113
</div>
WebContent/jsp/ss223_application/ibssAppUserEnquiryNoGroups.jsp
1
<%@ taglib uri="/WEB-INF/tld/struts-html-el" prefix="htmlEL" %>
2
<%@ taglib uri="/WEB-INF/tld/struts-bean" prefix="bean" %>
3
<%@ taglib uri="/WEB-INF/tld/struts-bean-el" prefix="beanEL" %>
4
<%@ taglib uri="/WEB-INF/tld/struts-logic" prefix="logic" %>
5
<%@ taglib uri="/WEB-INF/tld/struts-logic-el" prefix="logicEL" %>
6
<%@ taglib uri="/WEB-INF/tld/c" prefix="c" %>
7

  
8
<%@page import="java.util.HashMap"%>
9

  
10
<table id="errorTable">
11
<tr>
12
	<td>
13
		<span id="serverSideError" class="error"><jsp:include flush="true" page="/jsp/errorHandler.jsp"></jsp:include></span>
14
	</td>
15
</tr>
16
</table>
17

  
18
<h3><c:out value="${sessionScope.displayDesc}"/></h3>
19
<div id="resultBox"></div>
20

  
21
	<table class="tabularConfirm"width="517" border="1"">
22
		<tr>
23
		<td>
24
			<bean:message key="group.not.found"/>
25
		</td>
26
		</tr>
27
	</table>
28
	<htmlEL:form action="/ss103/createGroup.do">
29
	<table class="tabularForm"width="517" border="1"">
30
		<tr>
31
			<td>
32
				<htmlEL:submit property="action">
33
					<bean:message key="general.button.create"/>
34
				</htmlEL:submit>
35
			</td>
36
		</tr>
37
	</table>
38
	</htmlEL:form>	
WebContent/jsp/ss223_application/ibssAppUserEnquiryNoUsers.jsp
1
<%@ taglib uri="/WEB-INF/tld/struts-html-el" prefix="htmlEL" %>
2
<%@ taglib uri="/WEB-INF/tld/struts-bean" prefix="bean" %>
3
<%@ taglib uri="/WEB-INF/tld/struts-bean-el" prefix="beanEL" %>
4
<%@ taglib uri="/WEB-INF/tld/struts-logic" prefix="logic" %>
5
<%@ taglib uri="/WEB-INF/tld/struts-logic-el" prefix="logicEL" %>
6
<%@ taglib uri="/WEB-INF/tld/c" prefix="c" %>
7

  
8
<%@page import="java.util.HashMap"%>
9

  
10
<table id="errorTable">
11
<tr>
12
	<td>
13
		<span id="serverSideError" class="error"><jsp:include flush="true" page="/jsp/errorHandler.jsp"></jsp:include></span>
14
	</td>
15
</tr>
16
</table>
17

  
18
<h3><c:out value="${sessionScope.displayDesc}"/></h3>
19
<div id="resultBox"></div>
20

  
21
	<table class="tabularConfirm"width="517" border="1"">
22
		<tr>
23
		<td>
24
			<bean:message key="group.not.found"/>
25
		</td>
26
		</tr>
27
	</table>
28
	<htmlEL:form action="/ss223/createAppUserDetails.do">
29
	<table class="tabularForm"width="517" border="1"">
30
		<tr>
31
			<td>
32
				<htmlEL:submit property="action">
33
					<bean:message key="general.button.create"/>
34
				</htmlEL:submit>
35
			</td>
36
		</tr>
37
	</table>
38
	</htmlEL:form>	
WebContent/jsp/ss223_application/ibssAppUserEnquiryPagination.jsp
5 5
<%@ taglib uri="/WEB-INF/tld/struts-logic-el.tld" prefix="logicEL" %>
6 6
<%@ taglib uri="/WEB-INF/tld/c.tld" prefix="c" %>
7 7

  
8
<c:if test="${not empty ibssGroupForm.map.ibssGroupView}">
9
<bean:define id="ibssGroupView" name="ibssGroupForm" property="ibssGroupView"/>
10
<bean:define id="pagination" name="ibssGroupView" property="pagination" />
11
<bean:define id="groupEnquiryCurrentPageNo" name="ibssGroupView" property="groupEnquiryCurrentPageNo" />
12
<bean:define id="groupEnquiryTotalPageNo" name="ibssGroupView" property="groupEnquiryTotalPageNo" />
13
<bean:define id="paginationList" name="ibssGroupView" property="paginationList" />
8
<c:if test="${not empty appUserForm.map.viewBean}">
9
<bean:define id="viewBean" name="appUserForm" property="appUserViewBean"/>
10
<bean:define id="pagination" name="viewBean" property="pagination" />
11
<bean:define id="enquiryCurrentPageNo" name="viewBean" property="enquiryCurrentPageNo" />
12
<bean:define id="enquiryTotalPageNo" name="viewBean" property="enquiryTotalPageNo" />
13
<bean:define id="paginationList" name="viewBean" property="paginationList" />
14

  
15
<bean:define id="viewBean" name="appUserForm" property="appUserViewBean" />
16
<bean:define id="pagination" name="viewBean" property="pagination" />
14 17

  
15 18
<%
16 19
    java.util.HashMap paramsName = new java.util.HashMap();
......
28 31
		<%
29 32
			paramsName.put("p", firstPageNumber);
30 33
		%>
31
		<htmlEL:link action="/ss103/groupEnquiryMain.do" name="paramsName" onclick="overlay();">
34
		<htmlEL:link action="/ss223/appUserEnquiryMain.do" name="paramsName" onclick="overlay();">
32 35
			<u><bean:message key="general.link.first" /></u>
33 36
		</htmlEL:link>
34 37
	</li>
......
43 46
		<%
44 47
			paramsName.put("p", previousPageNumber);
45 48
		%>
46
		<htmlEL:link action="/ss103/groupEnquiryMain.do" name="paramsName" onclick="overlay();">
49
		<htmlEL:link action="/ss223/appUserEnquiryMain.do" name="paramsName" onclick="overlay();">
47 50
			<u><bean:message key="general.link.previous" /></u>
48 51
		</htmlEL:link>
49 52
	</li>
......
51 54

  
52 55
<li>
53 56
<bean:define id="currentPageNumber" name="pagination" property="currentPageNumber"/>
54
	<logicEL:iterate id="paginationList" name="ibssGroupView" property="paginationList">
57
	<logicEL:iterate id="paginationList" name="viewBean" property="paginationList">
55 58
	<%
56 59
		paramsName.put("p", paginationList);
57 60
	%>	
......
60 63
				<bean:write name="paginationList"/>
61 64
			</c:when>
62 65
			<c:otherwise>
63
				<htmlEL:link action="/ss103/groupEnquiryMain.do" name="paramsName" onclick="overlay();">
66
				<htmlEL:link action="/ss223/appUserEnquiryMain.do" name="paramsName" onclick="overlay();">
64 67
					<bean:write name="paginationList"/>
65 68
				</htmlEL:link>
66 69
			</c:otherwise>
......
81 84
		<%
82 85
			paramsName.put("p", nextPageNumber);
83 86
		%>
84
		<htmlEL:link action="/ss103/groupEnquiryMain.do" name="paramsName" onclick="overlay();">
87
		<htmlEL:link action="/ss223/appUserEnquiryMain.do" name="paramsName" onclick="overlay();">
85 88
			<u><bean:message key="general.link.next" /></u>
86 89
		</htmlEL:link>
87 90
	</li>
......
96 99
		<%
97 100
			paramsName.put("p", lastPageNumber);
98 101
		%>
99
		<htmlEL:link action="/ss103/groupEnquiryMain.do" name="paramsName" onclick="overlay();">
102
		<htmlEL:link action="/ss223/appUserEnquiryMain.do" name="paramsName" onclick="overlay();">
100 103
			<u><bean:message key="general.link.last" /></u>
101 104
		</htmlEL:link>
102 105
	</li>
src/com/ib/ibss/enterprise/services/ss223_application/IBSSApplicationUserDetailsServices.java
14 14
import java.util.ArrayList;
15 15
import java.util.List;
16 16

  
17
import my.com.upass.maybank.entities.UserProfile;
18

  
17 19
import com.ib.ibss.common.utils.IBSSLogger;
18 20
import com.ib.ibss.enterprise.services.IBSSEnterpriseServicesWorkspace;
19 21
import com.ib.ibss.enterprise.services.ss222_application.constants.IBSSApplicationUserConstants;
......
73 75
			
74 76
			for(IBSSDynaBean detailsBean : userList)
75 77
			{
76
				if(detailsBean.get(IBSSApplicationUserConstants.USER_ID) == Long.valueOf(userId))
78
				if(((Long)detailsBean.get(IBSSApplicationUserConstants.USER_ID)).equals(new Long(userId)))
77 79
				{
78
					userDetailBean.set (IBSSApplicationUserConstants.USER_ID, detailsBean.get(IBSSApplicationUserConstants.USER_ID));
79
					userDetailBean.set (IBSSApplicationUserConstants.USER_ALIAS, detailsBean.get(IBSSApplicationUserConstants.USER_ALIAS));
80
					userDetailBean.set (IBSSApplicationUserConstants.USER_DESCRIPTION, detailsBean.get(IBSSApplicationUserConstants.USER_DESCRIPTION));
81
					userDetailBean.set (IBSSApplicationUserConstants.APPLICATION_NAME, detailsBean.get(IBSSApplicationUserConstants.APPLICATION_NAME));
82
					userDetailBean.set (IBSSApplicationUserConstants.APPLICATION_ID, detailsBean.get(IBSSApplicationUserConstants.APPLICATION_ID));
83
					userDetailBean.set (IBSSApplicationUserConstants.USER_CREATION_DATE, detailsBean.get(IBSSApplicationUserConstants.USER_CREATION_DATE));
80
					userDetailBean.set (IBSSApplicationUserConstants.USER_ID, (Long)detailsBean.get(IBSSApplicationUserConstants.USER_ID));
81
					userDetailBean.set (IBSSApplicationUserConstants.USER_ALIAS, (String)detailsBean.get(IBSSApplicationUserConstants.USER_ALIAS));
82
					userDetailBean.set (IBSSApplicationUserConstants.USER_DESCRIPTION, (String)detailsBean.get(IBSSApplicationUserConstants.USER_DESCRIPTION));
83
					userDetailBean.set (IBSSApplicationUserConstants.APPLICATION_NAME, (String)detailsBean.get(IBSSApplicationUserConstants.APPLICATION_NAME));
84
					userDetailBean.set (IBSSApplicationUserConstants.APPLICATION_ID, (Integer)detailsBean.get(IBSSApplicationUserConstants.APPLICATION_ID));
85
					userDetailBean.set (IBSSApplicationUserConstants.USER_CREATION_DATE, (String)detailsBean.get(IBSSApplicationUserConstants.USER_CREATION_DATE));
84 86
					
85
					getIBSSDynaBean ().set (IBSSApplicationUserConstants.USER_PROFILE, detailsBean.get(IBSSApplicationUserConstants.USER_PROFILE));
87
					getIBSSDynaBean ().set (IBSSApplicationUserConstants.USER_PROFILE, (UserProfile)detailsBean.get(IBSSApplicationUserConstants.USER_PROFILE));
86 88
					break;
87 89
				}
88 90
			}
......
91 93
				
92 94
			getIBSSDynaBean ().set (IBSSApplicationUserConstants.APPLICATION_USER_VIEW_BEAN, appUserViewBean);
93 95
			getIBSSDynaBean ().set (IBSSApplicationUserConstants.APPLICATION_USER_DETAILS_BEAN, userDetailBean);
96
			
97
			userDetailBean = (IBSSDynaBean) getIBSSDynaBean ().get (IBSSApplicationUserConstants.APPLICATION_USER_DETAILS_BEAN);
94 98
		}
95 99
		catch (Exception e)
96 100
		{
src/com/ib/ibss/enterprise/services/ss223_application/IBSSApplicationUserMainServices.java
88 88
		
89 89
		try
90 90
		{
91
			System.out.println("111111111111");
92 91
			session = HibernateUtils.currentSession();
93 92
			session.beginTransaction();
94 93
			
......
99 98
			examples.add(new IbccUser());
100 99
			examples.add(new Im2uUser());
101 100
			
102
			System.out.println("getIBSSessionObjects().getSessionUserAlias() = "+getIBSSessionObjects().getSessionUserAlias());
103
			System.out.println("getIBSSessionObjects().getSessionUserPassword() = "+getIBSSessionObjects().getSessionUserPassword());
104 101
			List <UserProfile> userProfileList = upass.listProfilesByExamples(
105 102
					getIBSSessionObjects().getSessionUserAlias(), getIBSSessionObjects().getSessionUserPassword(),
106 103
					examples, null, null);
107 104
			
108
			System.out.println("2222222222");
109 105
			if (userProfileList == null)
110 106
			{
111
				System.out.println("null");
112 107
				throw IBSSErrorHandler.createDelegationException(IBSSApplicationUserConstants.NO_USER);
113 108
			}
114 109
			else
115 110
			{
116
				System.out.println("userProfileList = "+userProfileList.size());
117 111
				applicationUserViewBean = IBSSDynaBeanManager.createIBSSDynaBean(IBSSApplicationUserConstants.APPLICATION_USER_VIEW_BEAN, getIBSSDynaBean().getActionMapping());
118 112
				
119 113
				int indexNo 	= 0;
......
140 134
				
141 135
				for(int i = startIndex; i <= endIndex; i++)
142 136
				{
143
					System.out.println("4444444444444");
144 137
					UserProfile userProfile = userProfileList.get (i);
145 138
					appUserBean 	= IBSSDynaBeanManager.createIBSSDynaBean(IBSSApplicationUserConstants.APPLICATION_USER_BEAN, getIBSSDynaBean().getActionMapping());
146 139
					MinimalUserBean user = userProfile.getMinUser();
......
151 144
					
152 145
					session = HibernateUtils.currentSession();
153 146
					session.beginTransaction();
154
					AccessCheckResult result = upass.checkAppAccess(user.getUserAlias(), user.getHashedPassword(), session);
147
					AccessCheckResult result = upass.checkAppAccess(user.getUserAlias(), user.getDoubleHashedPassword(), session);
155 148
					
156 149
					for(ClientApp app : clientAppList)
157 150
					{
......
159 152
						{
160 153
							appUserBean.set (IBSSApplicationUserConstants.APPLICATION_NAME, app.getAppName());
161 154
							appUserBean.set (IBSSApplicationUserConstants.APPLICATION_ID, app.getAppId());
162
							break;
163 155
						}
164 156
					}
165 157
					appUserBean.set (IBSSApplicationUserConstants.USER_CREATION_DATE, user.getUdateCreated() != null ? m_oDateFormat.format (user.getUdateCreated()) : "");

Also available in: Unified diff