[Comsuite-svn] SF.net SVN: comsuite: [202] trunk/code
Brought to you by:
zduniak
Menu
▾
▴
[Comsuite-svn] SF.net SVN: comsuite: [202] trunk/code
|
From: <sku...@us...> - 2006-10-05 13:34:53
|
Revision: 202
http://svn.sourceforge.net/comsuite/?rev=202&view=rev
Author: skuzniak
Date: 2006-10-05 06:34:14 -0700 (Thu, 05 Oct 2006)
Log Message:
-----------
confirmation of deleting items provided.removing assigned roles from groups bug fixed.
Modified Paths:
--------------
trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/groups/GroupBean.java
trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/groups/SearchGroupBean.java
trunk/code/CSAdminPanel/WebContent/pages/actions/CSActionSearch.jsp
trunk/code/CSAdminPanel/WebContent/pages/groups/CSGroupSearch.jsp
trunk/code/CSAdminPanel/WebContent/pages/messages/CSMessages.jsp
trunk/code/CSAdminPanel/WebContent/pages/roles/CSRoleSearch.jsp
trunk/code/CSAdminPanel/WebContent/pages/servers/CSSAPServers.jsp
trunk/code/CSAdminPanel/WebContent/pages/users/CSUsersSearchResult.jsp
trunk/code/CSCommon/src/org/commsuite/ws/ICommunicateWS.java
trunk/code/CSMiddleware/src/org/commsuite/ws/CommunicateWS.java
trunk/code/CSMiddleware/src/org/commsuite/ws/services/GroupsService.java
Modified: trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/groups/GroupBean.java
===================================================================
--- trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/groups/GroupBean.java 2006-10-05 12:33:48 UTC (rev 201)
+++ trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/groups/GroupBean.java 2006-10-05 13:34:14 UTC (rev 202)
@@ -169,7 +169,7 @@
ids[i] = item.getValue().toString();
i++;
}
- ws.updateRolesForGroup(group, ids);
+ ws.updateRolesForGroup(group, ids, new String[0]);
LanguageSelectionBean.showMessage(BeansUtils.MESSAGE_GROUP_SUCCESSFULL,
BeansUtils.ADD_GROUP_NAVIGATION);
} catch (WebServiceException wse) {
Modified: trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/groups/SearchGroupBean.java
===================================================================
--- trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/groups/SearchGroupBean.java 2006-10-05 12:33:48 UTC (rev 201)
+++ trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/groups/SearchGroupBean.java 2006-10-05 13:34:14 UTC (rev 202)
@@ -64,6 +64,8 @@
private List<RoleExtended> temporaryRolesForGroup;
+ private List<RoleExtended> temporaryRolesForDelete;
+
private List<UserExtended> temporaryUsersForGroup;
private List<UserExtended> temporaryUsersForDelete;
@@ -532,14 +534,24 @@
i++;
}
final WSGroup group2 = ws.updateUsersForGroup(group, idsToAdd, idsToDelete);
-
+ logger.debug("adding");
int i2 = 0;
- final String[] ids2 = new String[this.temporaryRolesForGroup.size()];
+ final String[] idsToAdd2 = new String[this.temporaryRolesForGroup.size()];
for (final RoleExtended role : this.temporaryRolesForGroup) {
- ids2[i2] = String.valueOf(role.getRole().getId());
+ logger.debug("add "+ i2);
+ idsToAdd2[i2] = String.valueOf(role.getRole().getId());
i2++;
}
- ws.updateRolesForGroup(group2, ids2);
+ logger.debug("deleting");
+ i2 = 0;
+ final String[] idsToDelete2 = new String[this.temporaryRolesForDelete.size()];
+ for (final RoleExtended role : this.temporaryRolesForDelete) {
+ logger.debug("delete "+ i2);
+ idsToDelete2[i2] = String.valueOf(role.getRole().getId());
+ i2++;
+ }
+ logger.debug("updating");
+ ws.updateRolesForGroup(group2, idsToAdd2, idsToDelete2);
LanguageSelectionBean.showMessage(BeansUtils.MESSAGE_GROUP_SUCCESSFULL_UPDATE,
BeansUtils.SEARCH_GROUP_NAVIGATION);
} catch (WebServiceException wse) {
@@ -628,9 +640,14 @@
}
public String deleteSelectedRoles() {
+ if (null == this.temporaryRolesForDelete) {
+ this.temporaryRolesForDelete = new FastTable<RoleExtended>();
+ }
+
List<RoleExtended> roles = new FastTable<RoleExtended>();
for (RoleExtended r : this.temporaryRolesForGroup) {
if (r.isSelected()) {
+ this.temporaryRolesForDelete.add(r);
roles.add(r);
}
}
@@ -664,6 +681,7 @@
super();
// this.temporaryRolesForGroup = new FastTable<RoleExtended>();
this.temporaryUsersForDelete = new FastTable<UserExtended>();
+ this.temporaryRolesForDelete = new FastTable<RoleExtended>();
// this.temporaryUsersForGroup = new FastTable<UserExtended>();
}
Modified: trunk/code/CSAdminPanel/WebContent/pages/actions/CSActionSearch.jsp
===================================================================
--- trunk/code/CSAdminPanel/WebContent/pages/actions/CSActionSearch.jsp 2006-10-05 12:33:48 UTC (rev 201)
+++ trunk/code/CSAdminPanel/WebContent/pages/actions/CSActionSearch.jsp 2006-10-05 13:34:14 UTC (rev 202)
@@ -50,7 +50,8 @@
<h:outputText value="#{Locale.LABEL_ADD}" styleClass="header-command" />
</h:panelGrid>
</h:commandLink>
- <h:commandLink action="#{searchActionBean.deleteAction}" >
+ <h:commandLink onclick="if (!confirm('Are you sure you want to delete this record?')) return false"
+ action="#{searchActionBean.deleteAction}" >
<h:panelGrid columns="1">
<h:graphicImage value="#{pageContext.request.contextPath}/pages/files/gif/list-remove.gif" styleClass="header-icon" />
<h:outputText value="#{Locale.LABEL_DELETE}" styleClass="header-command" />
Modified: trunk/code/CSAdminPanel/WebContent/pages/groups/CSGroupSearch.jsp
===================================================================
--- trunk/code/CSAdminPanel/WebContent/pages/groups/CSGroupSearch.jsp 2006-10-05 12:33:48 UTC (rev 201)
+++ trunk/code/CSAdminPanel/WebContent/pages/groups/CSGroupSearch.jsp 2006-10-05 13:34:14 UTC (rev 202)
@@ -52,7 +52,8 @@
<h:outputText value="#{Locale.LABEL_ADD}" styleClass="header-command" />
</h:panelGrid>
</h:commandLink>
- <h:commandLink action="#{searchGroupBean.deleteGroup}" >
+ <h:commandLink onclick="if (!confirm('Are you sure you want to delete this record?')) return false"
+ action="#{searchGroupBean.deleteGroup}" >
<h:panelGrid columns="1">
<h:graphicImage value="#{pageContext.request.contextPath}/pages/files/gif/list-remove.gif" styleClass="header-icon" />
<h:outputText value="#{Locale.LABEL_DELETE}" styleClass="header-command" />
Modified: trunk/code/CSAdminPanel/WebContent/pages/messages/CSMessages.jsp
===================================================================
--- trunk/code/CSAdminPanel/WebContent/pages/messages/CSMessages.jsp 2006-10-05 12:33:48 UTC (rev 201)
+++ trunk/code/CSAdminPanel/WebContent/pages/messages/CSMessages.jsp 2006-10-05 13:34:14 UTC (rev 202)
@@ -66,7 +66,8 @@
<h:outputText value="#{Locale.LABEL_DETAILS}" styleClass="listView-header-value"/>
</h:panelGrid>
</h:commandLink>
- <h:commandLink actionListener="#{searchMessageBean.selectMessage}" action="#{searchMessageBean.deleteMesage}">
+ <h:commandLink onclick="if (!confirm('Are you sure you want to delete this record?')) return false"
+ actionListener="#{searchMessageBean.selectMessage}" action="#{searchMessageBean.deleteMesage}">
<f:param value="#{mes.id}" name="messageId" />
<h:panelGrid columns="1">
<h:graphicImage value="#{pageContext.request.contextPath}/pages/files/gif/list-remove.gif" styleClass="header-icon"/>
Modified: trunk/code/CSAdminPanel/WebContent/pages/roles/CSRoleSearch.jsp
===================================================================
--- trunk/code/CSAdminPanel/WebContent/pages/roles/CSRoleSearch.jsp 2006-10-05 12:33:48 UTC (rev 201)
+++ trunk/code/CSAdminPanel/WebContent/pages/roles/CSRoleSearch.jsp 2006-10-05 13:34:14 UTC (rev 202)
@@ -50,7 +50,8 @@
<h:outputText value="#{Locale.LABEL_ADD}" styleClass="header-command"/>
</h:panelGrid>
</h:commandLink>
- <h:commandLink action="#{searchRoleBean.deleteRole}" >
+ <h:commandLink onclick="if (!confirm('Are you sure you want to delete this record?')) return false"
+ action="#{searchRoleBean.deleteRole}" >
<h:panelGrid columns="1">
<h:graphicImage value="#{pageContext.request.contextPath}/pages/files/gif/list-remove.gif" styleClass="header-icon" />
<h:outputText value="#{Locale.LABEL_DELETE}" styleClass="header-command"/>
Modified: trunk/code/CSAdminPanel/WebContent/pages/servers/CSSAPServers.jsp
===================================================================
--- trunk/code/CSAdminPanel/WebContent/pages/servers/CSSAPServers.jsp 2006-10-05 12:33:48 UTC (rev 201)
+++ trunk/code/CSAdminPanel/WebContent/pages/servers/CSSAPServers.jsp 2006-10-05 13:34:14 UTC (rev 202)
@@ -58,7 +58,8 @@
<h:outputText value="#{Locale.LABEL_EDIT}" styleClass="header-command"/>
</h:panelGrid>
</h:commandLink>
- <h:commandLink actionListener="#{searchServerBean.selectServer}" action="#{searchServerBean.deleteServer}" >
+ <h:commandLink onclick="if (!confirm('Are you sure you want to delete this record?')) return false"
+ actionListener="#{searchServerBean.selectServer}" action="#{searchServerBean.deleteServer}" >
<f:param name="serverId" value="#{inst.instance.id}" />
<h:panelGrid columns="1">
<h:graphicImage value="#{pageContext.request.contextPath}/pages/files/gif/list-remove.gif" styleClass="header-icon"/>
Modified: trunk/code/CSAdminPanel/WebContent/pages/users/CSUsersSearchResult.jsp
===================================================================
--- trunk/code/CSAdminPanel/WebContent/pages/users/CSUsersSearchResult.jsp 2006-10-05 12:33:48 UTC (rev 201)
+++ trunk/code/CSAdminPanel/WebContent/pages/users/CSUsersSearchResult.jsp 2006-10-05 13:34:14 UTC (rev 202)
@@ -47,7 +47,8 @@
</h:panelGrid>
<f:param value="#{usr.id}" name="userId"/>
</h:commandLink>
- <h:commandLink actionListener="#{deleteUserBean.selectUser}" action="#{deleteUserBean.deleteUser}">
+ <h:commandLink onclick="if (!confirm('Are you sure you want to delete this record?')) return false"
+ actionListener="#{deleteUserBean.selectUser}" action="#{deleteUserBean.deleteUser}">
<h:panelGrid columns="1">
<h:graphicImage value="#{pageContext.request.contextPath}/pages/files/gif/user-trash.gif" styleClass="header-icon"/>
<h:outputText value="#{Locale.LABEL_DELETE}" styleClass="header-command" />
Modified: trunk/code/CSCommon/src/org/commsuite/ws/ICommunicateWS.java
===================================================================
--- trunk/code/CSCommon/src/org/commsuite/ws/ICommunicateWS.java 2006-10-05 12:33:48 UTC (rev 201)
+++ trunk/code/CSCommon/src/org/commsuite/ws/ICommunicateWS.java 2006-10-05 13:34:14 UTC (rev 202)
@@ -532,11 +532,12 @@
* updates roles assigned to <code>group</code>.
*
* @param wsGroup group to be updated
- * @param ids array of role ids
+ * @param idsToAdd array of role ids to add
+ * @param idsToDelete array of role ids to delete
* @return updated grouop object
* @throws WebServiceException on any error
*/
- public WSGroup updateRolesForGroup(WSGroup wsGroup, String[] ids) throws WebServiceException;
+ public WSGroup updateRolesForGroup(WSGroup wsGroup, String[] idsToAdd, String[] idsToDelete) throws WebServiceException;
/**
* updates users assigned to <code>group</code>.
Modified: trunk/code/CSMiddleware/src/org/commsuite/ws/CommunicateWS.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/ws/CommunicateWS.java 2006-10-05 12:33:48 UTC (rev 201)
+++ trunk/code/CSMiddleware/src/org/commsuite/ws/CommunicateWS.java 2006-10-05 13:34:14 UTC (rev 202)
@@ -710,10 +710,10 @@
*
* @see org.commsuite.ws.IcommunicateWS#updateRolesForGroup();
*/
- public WSGroup updateRolesForGroup(WSGroup wsGroup, String[] ids) throws WebServiceException {
+ public WSGroup updateRolesForGroup(WSGroup wsGroup, String[] idsToAdd, String[] idsToDelete) throws WebServiceException {
try {
GroupsService service = GroupsService.getInstance();
- return service.updateRolesForGroup(wsGroup, ids);
+ return service.updateRolesForGroup(wsGroup, idsToAdd, idsToDelete);
} catch (DataIntegrityViolationException dive) {
logger.fatal("Duplicate name error");
throw new WebServiceException(CommunicateUtils.DUPLICATED_GROUP_MESSAGE);
Modified: trunk/code/CSMiddleware/src/org/commsuite/ws/services/GroupsService.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/ws/services/GroupsService.java 2006-10-05 12:33:48 UTC (rev 201)
+++ trunk/code/CSMiddleware/src/org/commsuite/ws/services/GroupsService.java 2006-10-05 13:34:14 UTC (rev 202)
@@ -105,7 +105,7 @@
}
}
- public WSGroup updateRolesForGroup(WSGroup wsGroup, String[] ids) throws WebServiceException {
+ public WSGroup updateRolesForGroup(WSGroup wsGroup, String[] idsToAdd, String[] idsToDelete) throws WebServiceException {
Group group;
try {
GroupManager groupManager = (GroupManager) SpringMiddlewareContext.getGroupManager();
@@ -114,8 +114,8 @@
} else {
group = groupManager.getGroup(wsGroup.getId().toString());
}
- logger.debug("IDS: " + ids);
- group.getRoles().addAll(this.getRolesToGroup(ids));
+ logger.debug("IDS: " + idsToAdd);
+ this.saveGroupToRoles(group, idsToAdd, idsToDelete);
if (validateGroup(group)) {
return groupManager.saveGroup(group);
@@ -126,7 +126,7 @@
logger.fatal("Duplicate name error");
throw new DataIntegrityViolationException(CommunicateUtils.DUPLICATED_GROUP_MESSAGE);
} catch (Throwable t) {
- logger.fatal("Fatal exception[updateActionsForRole]", t);
+ logger.fatal("Fatal exception[updateRolesForGroup]", t);
throw new WebServiceException(t);
}
}
@@ -154,7 +154,7 @@
// TODO: [SK] w implementacji tej metody nie widze operacji na grupach wiec skad taka nazwa ?
// [SK]poniewaz ta metoda sluzy do pobrania rol, aby je do grupy przypisac
- private Set<Role> getRolesToGroup(String[] ids) {
+ /*private Set<Role> getRolesToGroup(String[] ids) {
RoleManager roleManager = (RoleManager) SpringMiddlewareContext.getRoleManager();
Set<Role> roles = new FastSet<Role>();
for (String id : ids) {
@@ -163,17 +163,19 @@
roles.add(role);
}
return roles;
- }
+ }*/
private void saveGroupToUsers(Group group, String[] idsToAdd, String[] idsToDelete) {
UserManager userManager = (UserManager) SpringMiddlewareContext.getUserManager();
for (String id : idsToAdd) {
+ logger.debug("Id to add: "+ id);
User user = userManager.getUser(id);
user.getGroups().add(group);
group.getUsers().add(user);
userManager.saveUser(user);
}
for (String id : idsToDelete) {
+ logger.debug("Id to delete: "+ id);
User user = userManager.getUser(id);
user.getGroups().remove(group);
group.getUsers().remove(user);
@@ -181,6 +183,24 @@
}
}
+ private void saveGroupToRoles(Group group, String[] idsToAdd, String[] idsToDelete) {
+ RoleManager roleManager = (RoleManager) SpringMiddlewareContext.getRoleManager();
+ for (String id : idsToAdd) {
+ logger.debug("Id to add: "+ id);
+ Role role = roleManager.getRole(id);
+ role.getGroups().add(group);
+ group.getRoles().add(role);
+ roleManager.saveRole(role);
+ }
+ for (String id : idsToDelete) {
+ logger.debug("Id to delete: "+ id);
+ Role role = roleManager.getRole(id);
+ role.getGroups().remove(group);
+ group.getRoles().remove(role);
+ roleManager.saveRole(role);
+ }
+ }
+
public void deleteGroupFromDatabase(String id) throws WebServiceException {
try {
GroupManager groupManager = (GroupManager) SpringMiddlewareContext.getGroupManager();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
