[jboss-cvs] JBossBlog SVN: r315 - in trunk: src/services/org/jboss/blog/service and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon May 19 07:41:11 EDT 2008
Author: adamw
Date: 2008-05-19 07:41:11 -0400 (Mon, 19 May 2008)
New Revision: 315
Modified:
trunk/src/action/org/jboss/blog/session/group/GroupsServiceImpl.java
trunk/src/services/org/jboss/blog/service/GroupsService.java
trunk/view/security/security_manager.xhtml
Log:
Modified: trunk/src/action/org/jboss/blog/session/group/GroupsServiceImpl.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/group/GroupsServiceImpl.java 2008-05-19 11:01:18 UTC (rev 314)
+++ trunk/src/action/org/jboss/blog/session/group/GroupsServiceImpl.java 2008-05-19 11:41:11 UTC (rev 315)
@@ -50,4 +50,11 @@
.createQuery("select feed from Feed feed where feed.group = ?1 and feed.restricted = true")
.setParameter(1, group).setHint("org.hibernate.cacheable", Boolean.TRUE).getResultList();
}
+
+ public List<Feed> allAcceptedFeeds(Group group) {
+ //noinspection unchecked
+ return entityManager
+ .createQuery("select feed from Feed feed where feed.group = ?1 and feed.accepted = true")
+ .setParameter(1, group).setHint("org.hibernate.cacheable", Boolean.TRUE).getResultList();
+ }
}
Modified: trunk/src/services/org/jboss/blog/service/GroupsService.java
===================================================================
--- trunk/src/services/org/jboss/blog/service/GroupsService.java 2008-05-19 11:01:18 UTC (rev 314)
+++ trunk/src/services/org/jboss/blog/service/GroupsService.java 2008-05-19 11:41:11 UTC (rev 315)
@@ -16,4 +16,6 @@
List<Feed> unacceptedFeeds(Group group);
List<Feed> restrictedFeeds(Group group);
+
+ List<Feed> allAcceptedFeeds(Group group);
}
Modified: trunk/view/security/security_manager.xhtml
===================================================================
--- trunk/view/security/security_manager.xhtml 2008-05-19 11:01:18 UTC (rev 314)
+++ trunk/view/security/security_manager.xhtml 2008-05-19 11:41:11 UTC (rev 315)
@@ -117,7 +117,7 @@
<s:fragment rendered="#{identity.hasPermission('management_group', 'view', group)}">
#{group.displayName}:
<table cellspacing="5" class="deftable" width="75%">
- <ui:repeat var="feed" value="#{groupsService.acceptedFeeds(group)}">
+ <ui:repeat var="feed" value="#{feedsSecurity.filterViewableFeeds(groupsService.allAcceptedFeeds(group))}">
<tr>
<td class="term" width="15%">#{feed.name}</td>
<td class="def">
@@ -170,48 +170,50 @@
<s:fragment rendered="#{identity.hasPermission('management_group', 'view', group)}">
#{group.displayName}:
<table cellspacing="5" class="deftable" width="75%">
- <ui:repeat var="feed" value="#{groupsService.acceptedFeeds(group)}">
- <tr>
- <td class="term" width="15%">#{feed.name}</td>
- <td class="def">
- <ui:repeat var="securityGroup" value="#{securityMod.getFeedViewersGroups(feed)}">
- <li>
- #{externalSecurityService.getDisplayName(securityGroup)}
- (
- <s:link value="delete" action="#{securityMod.deleteSecurityGroup}">
- <f:param name="role" value="VIEW" />
- <f:param name="feed" value="#{feed.name}" />
- <f:param name="securityGroup" value="#{securityGroup.externalId}" />
- </s:link>
- )
- </li>
- </ui:repeat>
+ <ui:repeat var="feed" value="#{groupsService.restrictedFeeds(group)}">
+ <s:fragment rendered="#{identity.hasPermission('feed', 'view', feed)}">
+ <tr>
+ <td class="term" width="15%">#{feed.name}</td>
+ <td class="def">
+ <ui:repeat var="securityGroup" value="#{securityMod.getFeedViewersGroups(feed)}">
+ <li>
+ #{externalSecurityService.getDisplayName(securityGroup)}
+ (
+ <s:link value="delete" action="#{securityMod.deleteSecurityGroup}">
+ <f:param name="role" value="VIEW" />
+ <f:param name="feed" value="#{feed.name}" />
+ <f:param name="securityGroup" value="#{securityGroup.externalId}" />
+ </s:link>
+ )
+ </li>
+ </ui:repeat>
- <s:link value="Add user group" view="/security/security_group_add.xhtml">
- <f:param name="role" value="VIEW" />
- <f:param name="feed" value="#{feed.name}" />
- </s:link>
- </td>
- <td class="def">
- <ui:repeat var="securityUser" value="#{securityMod.getFeedViewersUsers(feed)}">
- <li>
- #{externalSecurityService.getDisplayName(securityUser)}
- (
- <s:link value="delete" action="#{securityMod.deleteSecurityUser}">
- <f:param name="role" value="VIEW" />
- <f:param name="feed" value="#{feed.name}" />
- <f:param name="securityUser" value="#{securityUser.externalId}" />
- </s:link>
- )
- </li>
- </ui:repeat>
+ <s:link value="Add user group" view="/security/security_group_add.xhtml">
+ <f:param name="role" value="VIEW" />
+ <f:param name="feed" value="#{feed.name}" />
+ </s:link>
+ </td>
+ <td class="def">
+ <ui:repeat var="securityUser" value="#{securityMod.getFeedViewersUsers(feed)}">
+ <li>
+ #{externalSecurityService.getDisplayName(securityUser)}
+ (
+ <s:link value="delete" action="#{securityMod.deleteSecurityUser}">
+ <f:param name="role" value="VIEW" />
+ <f:param name="feed" value="#{feed.name}" />
+ <f:param name="securityUser" value="#{securityUser.externalId}" />
+ </s:link>
+ )
+ </li>
+ </ui:repeat>
- <s:link value="Add user" view="/security/security_user_add.xhtml">
- <f:param name="role" value="VIEW" />
- <f:param name="feed" value="#{feed.name}" />
- </s:link>
- </td>
- </tr>
+ <s:link value="Add user" view="/security/security_user_add.xhtml">
+ <f:param name="role" value="VIEW" />
+ <f:param name="feed" value="#{feed.name}" />
+ </s:link>
+ </td>
+ </tr>
+ </s:fragment>
</ui:repeat>
</table>
</s:fragment>
More information about the jboss-cvs-commits
mailing list