Revision 77:9d76e0afd4b7

View differences:

WebContent/WEB-INF/config/ss223_application/form-beans.xml
15 15
			<form-property name="clientAppList" type="java.util.List" />
16 16
			<form-property name="userId" type="java.lang.String" />
17 17
			<form-property name="userAlias" type="java.lang.String" />
18
			<form-property name="userStatus" type="java.lang.String" />
18 19
			<form-property name="userName" type="java.lang.String" />
19 20
			<form-property name="userDescription" type="java.lang.String" />
20 21
			<form-property name="selectedAppId" type="java.lang.String" />
WebContent/WEB-INF/config/ss223_application/view-beans.xml
17 17

  
18 18
		<form-bean name="appUserBean" type="org.apache.struts.action.DynaActionForm">
19 19
			<form-property name="userId" type="java.lang.Long" />
20
			<form-property name="userStatus" type="java.lang.String" />
20 21
			<form-property name="userName" type="java.lang.String" />
21 22
			<form-property name="userDescription" type="java.lang.String" />
22 23
			<form-property name="userAlias" type="java.lang.String" />
......
29 30

  
30 31
		<form-bean name="appUserDetailsBean" type="org.apache.struts.action.DynaActionForm">
31 32
			<form-property name="userId" type="java.lang.Long" />
33
			<form-property name="userStatus" type="java.lang.String" />
32 34
			<form-property name="userName" type="java.lang.String" />
33 35
			<form-property name="userDescription" type="java.lang.String" />
34 36
			<form-property name="userAlias" type="java.lang.String" />
WebContent/jsp/ss223_application/ibssAppUserDetails.jsp
31 31
    <td colspan="2"><strong><c:out value="${detailBean.map.userAlias}"/></strong></td>
32 32
    <td colspan="2">&nbsp;</td>
33 33
  </tr>
34
  <%-- <tr>
35
    <td>&nbsp;</td>
36
    <td><bean:message key="appuser.user.status"/>:</td>
37
    <td colspan="2"><strong><c:out value="${detailBean.map.userStatus}"/></strong></td>
38
    <td colspan="2">&nbsp;</td>
39
  </tr> --%>
34 40
   <tr>
35 41
    <td>&nbsp;</td>
36 42
    <td><bean:message key="appuser.application.name"/>:</td>
WebContent/jsp/ss223_application/ibssAppUserEditDetails.jsp
39 39
    <td colspan="2"><strong><c:out value="${detailBean.map.userAlias}"/></strong></td>
40 40
    <td>&nbsp;</td>
41 41
    </tr>
42
 <%--  <tr>
43
    <td>&nbsp;</td>
44
    <td><bean:message key="appuser.user.status"/>:</td>
45
    <td colspan="2"><strong><c:out value="${detailBean.map.userStatus}"/></strong></td>
46
    <td colspan="2">&nbsp;</td>
47
  </tr> --%>
48
  <tr>
49
    <td>&nbsp;</td>
50
    <td><bean:message key="appuser.application.name"/>:</td>
51
    <td colspan="2"><strong><c:out value="${detailBean.map.appName}"/></strong></td>
52
    <td colspan="2">&nbsp;</td>
53
  </tr>
42 54
  <tr>
43 55
    <td width="69">&nbsp;</td>
44 56
    <td><bean:message key="appuser.user.description"/>:</td>
resource/com/ib/ibss/resources/message/IBSSApplicationResources.properties
2959 2959
appuser.id=ID
2960 2960
appuser.user.id=User ID
2961 2961
appuser.user.alias=User Alias
2962
appuser.user.status=User Status
2962 2963
appuser.user.name=User Name
2963 2964
appuser.user.description=User Description
2964 2965
appuser.user.password=New Password
src/com/ib/ibss/enterprise/services/ss222_application/constants/IBSSApplicationUserConstants.java
25 25
	public static final String CLIENT_APP_LIST					= "clientAppList";
26 26
	public static final String USER_ID							= "userId";
27 27
	public static final String USER_ALIAS						= "userAlias";
28
	public static final String USER_STATUS						= "userStatus";
28 29
	public static final String USER_NAME						= "userName";
29 30
	public static final String USER_DESCRIPTION					= "userDescription";
30 31
	public static final String SELECTED_APPLICATION_ID			= "selectedAppId";
src/com/ib/ibss/enterprise/services/ss223_application/IBSSApplicationUserDetailsServices.java
67 67
				{
68 68
					userDetailBean.set (IBSSApplicationUserConstants.USER_ID, (Long)detailsBean.get(IBSSApplicationUserConstants.USER_ID));
69 69
					userDetailBean.set (IBSSApplicationUserConstants.USER_ALIAS, (String)detailsBean.get(IBSSApplicationUserConstants.USER_ALIAS));
70
					userDetailBean.set (IBSSApplicationUserConstants.USER_NAME, (String)detailsBean.get(IBSSApplicationUserConstants.USER_NAME));
70
//					userDetailBean.set (IBSSApplicationUserConstants.USER_STATUS, (String)detailsBean.get(IBSSApplicationUserConstants.USER_STATUS));
71 71
					userDetailBean.set (IBSSApplicationUserConstants.USER_DESCRIPTION, (String)detailsBean.get(IBSSApplicationUserConstants.USER_DESCRIPTION));
72 72
					userDetailBean.set (IBSSApplicationUserConstants.APPLICATION_NAME, (String)detailsBean.get(IBSSApplicationUserConstants.APPLICATION_NAME));
73 73
					userDetailBean.set (IBSSApplicationUserConstants.APPLICATION_ID, (Integer)detailsBean.get(IBSSApplicationUserConstants.APPLICATION_ID));
src/com/ib/ibss/enterprise/services/ss223_application/IBSSApplicationUserEditDetailsServices.java
47 47
			userDetailBean = (IBSSDynaBean) getIBSSDynaBean().get(IBSSApplicationUserConstants.APPLICATION_USER_DETAILS_BEAN);
48 48
			
49 49
			getIBSSDynaBean().set (IBSSApplicationUserConstants.USER_ALIAS, (String) userDetailBean.get (IBSSApplicationUserConstants.USER_ALIAS));
50
			getIBSSDynaBean().set (IBSSApplicationUserConstants.USER_NAME, (String) userDetailBean.get (IBSSApplicationUserConstants.USER_NAME));
50
//			getIBSSDynaBean().set (IBSSApplicationUserConstants.USER_STATUS, (String) userDetailBean.get (IBSSApplicationUserConstants.USER_STATUS));
51 51
			getIBSSDynaBean().set (IBSSApplicationUserConstants.SELECTED_APPLICATION_NAME, (String) userDetailBean.get (IBSSApplicationUserConstants.APPLICATION_NAME));
52 52
			getIBSSDynaBean().set (IBSSApplicationUserConstants.USER_DESCRIPTION, (String) userDetailBean.get (IBSSApplicationUserConstants.USER_DESCRIPTION));
53 53
		}
src/com/ib/ibss/enterprise/services/ss223_application/IBSSApplicationUserMainServices.java
13 13

  
14 14
import java.text.SimpleDateFormat;
15 15
import java.util.ArrayList;
16
import java.util.HashMap;
16 17
import java.util.List;
17 18
import java.util.Map;
18 19

  
......
27 28
import org.hibernate.Session;
28 29

  
29 30
import com.ib.ibss.common.constant.AdminPermissionModeType.ApplicationPermission;
31
import com.ib.ibss.common.constant.BusinessOptions;
30 32
import com.ib.ibss.common.constant.FunctionConstants.FunctionCodeEnum;
31 33
import com.ib.ibss.common.constant.IBSSCommonConstants;
32 34
import com.ib.ibss.common.utils.IBSSLogger;
......
76 78
		
77 79
		SimpleDateFormat m_oDateFormat = new SimpleDateFormat(IBSSCommonConstants.STANDARD_DATE_FORMAT_DDMMYYYY);
78 80
		
79
		UPassControllerV2 controller = new UPassControllerV2();
81
		UPassControllerV2 controller   = new UPassControllerV2();
80 82
		Session session = null;
81 83
		
82
		List<MinimalUserBean> userFromMapList = null;
84
		List<MinimalUserBean> userFromMapList 	 = null;
83 85
		List<UserAppAccess> appAccessFromMapList = null;
84 86
		
87
//		Map<String, String> statusMap = new HashMap<String, String> ();
88
		
85 89
		try
86 90
		{
87 91
			String upassAdmin		= ResourcesUtils.getAppConfigValue("application.upass.admin.id");
......
100 104
			{
101 105
				applicationUserViewBean = IBSSDynaBeanManager.createIBSSDynaBean(IBSSApplicationUserConstants.APPLICATION_USER_VIEW_BEAN, getIBSSDynaBean().getActionMapping());
102 106
				
107
//				statusMap = ResourcesUtils.getBusinessOptionsResourceKey(BusinessOptions.USER_STATUS);
108
				
103 109
				userFromMapList = new ArrayList<MinimalUserBean>(appAdminMap.keySet());
104 110
				appAccessFromMapList = new ArrayList<UserAppAccess>(appAdminMap.values());
105 111
				
......
129 135
					appUserBean.set (IBSSApplicationUserConstants.USER_ID, user.getUserID());
130 136
					appUserBean.set (IBSSApplicationUserConstants.USER_DESCRIPTION, user.getDescription());
131 137
					appUserBean.set (IBSSApplicationUserConstants.USER_ALIAS, user.getUserAlias());
138
//					appUserBean.set (IBSSApplicationUserConstants.USER_STATUS, statusMap.get(String.valueOf (user.getUstate())));
132 139
					
133 140
					UserAppAccess app = appAccessFromMapList.get(i);
134 141
					appUserBean.set (IBSSApplicationUserConstants.APPLICATION_NAME, app.getApp().getAppName());

Also available in: Unified diff