[jboss-svn-commits] JBL Code SVN: r13609 - in labs/jbossforums/branches/forums110P26: forums/src/resources/portal-forums-war/views/topics and 1 other directory.

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

Author: unibrew
Date: 2007-07-18 13:34:03 -0400 (Wed, 18 Jul 2007)
New Revision: 13609

Modified:
   labs/jbossforums/branches/forums110P26/authz-jaae-plugin/src/resources/forums-authz-plugin.sar/META-INF/acl-mapping.xml
   labs/jbossforums/branches/forums110P26/forums/src/resources/portal-forums-war/views/topics/posting_edit_body.xhtml
   labs/jbossforums/branches/forums110P26/forums/src/resources/portal-forums-war/views/topics/posting_new_body.xhtml
Log:
[JBFORUMS-248] Security checks for choosing topicType while posting or editing a post.

Modified: labs/jbossforums/branches/forums110P26/authz-jaae-plugin/src/resources/forums-authz-plugin.sar/META-INF/acl-mapping.xml
===================================================================
--- labs/jbossforums/branches/forums110P26/authz-jaae-plugin/src/resources/forums-authz-plugin.sar/META-INF/acl-mapping.xml	2007-07-18 17:33:12 UTC (rev 13608)
+++ labs/jbossforums/branches/forums110P26/authz-jaae-plugin/src/resources/forums-authz-plugin.sar/META-INF/acl-mapping.xml	2007-07-18 17:34:03 UTC (rev 13609)
@@ -191,7 +191,10 @@
 			</resource>
 			<resource type="fragment">
 				<id>acl://reply</id>
-			</resource>
+			</resource>
+            <resource type="fragment" criteriaId="topicType://ui" >
+                <id>acl://topicType</id>
+            </resource>
 			<!-- action protection -->
 			<resource type="jsfAction">				
 				<class>org.jboss.portlet.forums.ui.action.NewTopic</class>

Modified: labs/jbossforums/branches/forums110P26/forums/src/resources/portal-forums-war/views/topics/posting_edit_body.xhtml
===================================================================
--- labs/jbossforums/branches/forums110P26/forums/src/resources/portal-forums-war/views/topics/posting_edit_body.xhtml	2007-07-18 17:33:12 UTC (rev 13608)
+++ labs/jbossforums/branches/forums110P26/forums/src/resources/portal-forums-war/views/topics/posting_edit_body.xhtml	2007-07-18 17:34:03 UTC (rev 13609)
@@ -556,6 +556,7 @@
 
     <!-- Add Options -->
     <c:if test="#{editPost.firstPost}">
+    <forums:isAllowed fragment="acl://topicType" contextData="#{editPost.forumId}">
     <tr class="PostViewUnderlineBoth">
         <td valign="top">
             <label class="forumformlabelbold">
@@ -577,6 +578,7 @@
             </h:selectOneRadio>
         </td>
     </tr>
+    </forums:isAllowed>
     </c:if>
     
     <!-- poll ui -->

Modified: labs/jbossforums/branches/forums110P26/forums/src/resources/portal-forums-war/views/topics/posting_new_body.xhtml
===================================================================
--- labs/jbossforums/branches/forums110P26/forums/src/resources/portal-forums-war/views/topics/posting_new_body.xhtml	2007-07-18 17:33:12 UTC (rev 13608)
+++ labs/jbossforums/branches/forums110P26/forums/src/resources/portal-forums-war/views/topics/posting_new_body.xhtml	2007-07-18 17:34:03 UTC (rev 13609)
@@ -553,7 +553,8 @@
         </td>
     </tr>
 
-    <!-- Add Options -->
+    <!-- Add Options -->
+    <forums:isAllowed fragment="acl://topicType" contextData="#{newTopic.forumId}">
     <tr class="PostViewUnderlineBoth">
         <td valign="top">
             <label class="forumformlabelbold">
@@ -575,6 +576,7 @@
             </h:selectOneRadio>
         </td>
     </tr>
+    </forums:isAllowed>
     
     <!-- poll ui -->
     <forums:isAllowed fragment="acl://managePoll">