[jboss-cvs] JBossBlog SVN: r314 - in trunk: src/action/org/jboss/blog/session/feed/mod and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: adamw
Date: 2008-05-19 07:01:18 -0400 (Mon, 19 May 2008)
New Revision: 314

Modified:
   trunk/resources/META-INF/security.drl
   trunk/src/action/org/jboss/blog/session/feed/mod/IndividualFeedModBean.java
Log:


Modified: trunk/resources/META-INF/security.drl
===================================================================
--- trunk/resources/META-INF/security.drl	2008-05-18 12:43:51 UTC (rev 313)
+++ trunk/resources/META-INF/security.drl	2008-05-19 11:01:18 UTC (rev 314)
@@ -10,14 +10,6 @@
 import org.jboss.blog.model.security.FeedsSecurityRole;
 import org.jboss.blog.session.security.FeedsCombinedRole;
 
-// TODO: remove
-/* rule Dev
-when
-  c: PermissionCheck()
-then
-  c.grant();
-end; */
-
 rule CanDoAnything
 when
   c: PermissionCheck()
@@ -186,11 +178,11 @@
 when
   c: PermissionCheck(name == "feed", action == "view") and
   (
-    Feed(feedRestricted == false)
-  ) or
-  (
-    feed : Feed(feedRestricted == true) and
-    FeedsCombinedRole(role == FeedsSecurityRole.VIEW, id == feed.id)
+    Feed(feedRestricted == false) or
+    (
+      feed : Feed(feedRestricted == true) and
+      FeedsCombinedRole(role == FeedsSecurityRole.VIEW, id == feed.id)
+    )
   )
 then
   c.grant();
@@ -202,9 +194,7 @@
   feed : Feed(feedRestricted == true) and
   group : Group() from feed.group and
   (
-    FeedsCombinedRole(role == FeedsSecurityRole.FEED_ADMIN, id == feed.id)
-  ) or
-  (
+    FeedsCombinedRole(role == FeedsSecurityRole.FEED_ADMIN, id == feed.id) or
     FeedsCombinedRole(role == FeedsSecurityRole.GROUP_ADMIN, id == group.id)
   )
 then

Modified: trunk/src/action/org/jboss/blog/session/feed/mod/IndividualFeedModBean.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/feed/mod/IndividualFeedModBean.java	2008-05-18 12:43:51 UTC (rev 313)
+++ trunk/src/action/org/jboss/blog/session/feed/mod/IndividualFeedModBean.java	2008-05-19 11:01:18 UTC (rev 314)
@@ -181,8 +181,6 @@
     }
 
     public void setSelectedPostTitleAsId(String selectedPostTitleAsId) {
-        System.out.println("SETTING postTitleAsId");
-        
         this.selectedPostTitleAsId = selectedPostTitleAsId;
 
         if (parsedFeed != null) {
@@ -212,9 +210,7 @@
     }
 
     public void updateSelectedPost() {
-        System.out.println("Updating post author");
         if (!StringTools.isEmpty(selectedPost.getAuthor())) {
-            System.out.println("To " + selectedPost.getAuthor());
             postAuthor = selectedPost.getAuthor();
         }
     }