Revision 76:fa116568a9c0

View differences:

WebContent/jsp/ss103_group/ibssGroupCreate.jsp
78 78
				<li class="<c:out value="${css}"/>">
79 79
					<htmlEL:multibox styleClass="checkAll" property="selectedAccesses" disabled="false"><c:out value="${item.nodeId}"/></htmlEL:multibox>				  	
80 80
					<label class="nodeName"><c:out value="${item.nodeName}"/></label>
81
					(<c:out value="${item.nodeCode}"/>) 1
81
					(<c:out value="${item.nodeCode}"/>)
82 82
					<div class="<c:out value="${item.nodeId}"/>">
83 83
					<c:if test="${not empty item.subNavigations}">
84 84
					<ul>
......
88 88
						<li class="<c:out value="${css}"/>">
89 89
							<htmlEL:multibox styleClass="subAll" property="selectedAccesses" disabled="false"><c:out value="${subItem.nodeId}"/></htmlEL:multibox>
90 90
							<label class="nodeName"><c:out value="${subItem.nodeName}"/></label>
91
							(<c:out value="${subItem.nodeCode}"/>) 2
91
							(<c:out value="${subItem.nodeCode}"/>)
92 92
							<div class="<c:out value="${subItem.nodeId}"/>">
93 93
							<c:if test="${not empty subItem.subNavigations}">
94 94
							<ul>
src/com/ib/ibss/enterprise/services/ss103_group/IBSSUserGroupDeleteConfirmServices.java
31 31
				throw IBSSErrorHandler.createBusinessException(IBSSBusinessException.PENDING_GROUP,"pending.approval");
32 32
			}
33 33
			
34
			List <AdminUserProfile> a = getAdminUserProfileDAO().getUsersGroup(Long.valueOf (groupID));
34
			List <AdminUserProfile> groupAdminUsers = getAdminUserProfileDAO().getUsersByGroupID(Long.valueOf (groupID));
35 35
			
36
			if (a.size() != 0){
36
			if (groupAdminUsers.size() != 0){
37 37
				
38 38
				throw IBSSErrorHandler.createBusinessException ("admin.group.delete.", "2");
39 39
			}
......
44 44
		}
45 45
		
46 46
	}
47
	
48
	public static void main(String[] args) {
49
		
50
	}
47 51

  
48 52
}
src/com/ib/ibss/enterprise/services/ss103_group/IBSSUserGroupDeleteResultServices.java
79 79
//					getAdminUserProfileDAO ().updateUser (m_oUser);
80 80
//				}
81 81
				
82
				List <AdminUserProfile> a = getAdminUserProfileDAO().getUsersGroup(Long.valueOf (m_sGroupID));
83
				
84
				if (a.size() != 0){
82
				if (m_oUsers.size() != 0){
85 83
					
86 84
					m_sLogReason = "Admin group deletion unsuccessful because the group still has active users";
87 85
					throw IBSSErrorHandler.createBusinessException ("admin.group.delete.", "2");

Also available in: Unified diff