[OFBiz] SVN: r7546 - in trunk/specialized/community: data webapp/community/WEB-INF widget/community/forum

[byersa@svn.ofbiz.org]

Author: byersa
Date: 2006-05-08 23:01:54 -0500 (Mon, 08 May 2006)
New Revision: 7546

Modified:
   trunk/specialized/community/data/PubPtData.xml
   trunk/specialized/community/webapp/community/WEB-INF/controller.xml
   trunk/specialized/community/widget/community/forum/ForumTrees.xml
Log:
These are Hans's changes.


Modified: trunk/specialized/community/data/PubPtData.xml
===================================================================
--- trunk/specialized/community/data/PubPtData.xml	2006-05-08 15:31:21 UTC (rev 7545)
+++ trunk/specialized/community/data/PubPtData.xml	2006-05-09 04:01:54 UTC (rev 7546)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity-engine-xml>
-<Content contentId="UNDERSUNROOT"  contentTypeId="WEB_SITE_PUB_PT" 
+ <Content contentId="UNDERSUNROOT"  contentTypeId="FORUM_ROOT" 
  contentName="Undersun Root" 
  description="Undersun Root" 
  childBranchCount="1" 
@@ -10,7 +10,7 @@
  createdDate="2004-10-16 17:32:31.285" 
  lastModifiedDate="2004-10-16 17:32:31.291" /> 
 
-<Content contentId="OFBIZDOCROOT"  contentTypeId="WEB_SITE_PUB_PT" 
+ <Content contentId="OFBIZDOCROOT"  contentTypeId="FORUM_ROOT" 
  ownerContentId="UNDERSUNROOT"
  contentName="Documentation Root" 
  description="Documentation Root" 
@@ -21,7 +21,7 @@
  createdDate="2004-10-16 17:32:31.285" 
  lastModifiedDate="2004-10-16 17:32:31.291" /> 
 
-<Content contentId="BLOGROOT"  contentTypeId="WEB_SITE_PUB_PT" 
+ <Content contentId="BLOGROOT"  contentTypeId="FORUM_ROOT" 
  ownerContentId="UNDERSUNROOT"
  contentName="Blog Root" 
  description="Blog Root" 
@@ -32,7 +32,7 @@
  createdDate="2004-10-16 17:32:31.285" 
  lastModifiedDate="2004-10-16 17:32:31.291" /> 
 
-<Content contentId="FORUMROOT"  contentTypeId="WEB_SITE_PUB_PT" 
+ <Content contentId="FORUMROOT"  contentTypeId="FORUM_ROOT" 
  ownerContentId="UNDERSUNROOT"
  contentName="Forum Root" 
  description="Forum Root" 
@@ -53,7 +53,7 @@
  createdDate="2004-11-22 17:32:33.988" 
  lastModifiedDate="2004-11-22 17:32:33.988" /> 
 
-<Content contentId="BLOGROOTJAZ"  contentTypeId="WEB_SITE_PUB_PT" 
+ <Content contentId="BLOGROOTJAZ"  contentTypeId="FORUM_ROOT" 
  ownerContentId="BLOGROOT"
  contentName="Andy Zeneski's Blog" 
  description="Andy Zeneski's Blog" 

Modified: trunk/specialized/community/webapp/community/WEB-INF/controller.xml
===================================================================
--- trunk/specialized/community/webapp/community/WEB-INF/controller.xml	2006-05-08 15:31:21 UTC (rev 7545)
+++ trunk/specialized/community/webapp/community/WEB-INF/controller.xml	2006-05-09 04:01:54 UTC (rev 7546)
@@ -224,10 +224,10 @@
         <response name="error" type="view" value="ViewForumResponse"/>
     </request-map>
 
-    <request-map uri="addPublishStatus">
+    <!--request-map uri="addPublishStatus">
         <security https="false" auth="true"/>
         <event type="service" path="" invoke="followNodeChildren"/>
-    </request-map>
+    </request-map-->
 
 
     <!-- end of request mappings -->

Modified: trunk/specialized/community/widget/community/forum/ForumTrees.xml
===================================================================
--- trunk/specialized/community/widget/community/forum/ForumTrees.xml	2006-05-08 15:31:21 UTC (rev 7545)
+++ trunk/specialized/community/widget/community/forum/ForumTrees.xml	2006-05-09 04:01:54 UTC (rev 7546)
@@ -10,13 +10,12 @@
             <include-screen name="responseTreeLine" location="component://community/widget/community/forum/ForumScreens.xml" />
             <sub-node node-name="node-body">
                 <entity-condition entity-name="ContentAssocViewFrom" use-cache="false" >
-                
-                    <order-by field-name="caFromDate DESC"/>
                    <condition-list combine="and">
                         <condition-expr field-name="caContentIdTo" operator="equals" env-name="rsp.contentId" />
                         <condition-expr field-name="caContentAssocTypeId" operator="equals" value="RESPONSE" />
                         <condition-expr field-name="caThruDate" operator="equals" value=""/>
                    </condition-list> 
+                    <order-by field-name="caFromDate DESC"/>
                 </entity-condition>
             </sub-node>
         </node>
@@ -24,12 +23,12 @@
             <include-screen name="responseTreeLine"  location="component://community/widget/community/forum/ForumScreens.xml" />
             <sub-node node-name="node-body">
                 <entity-condition entity-name="ContentAssocViewFrom" use-cache="true" >
-                    <order-by field-name="caFromDate DESC"/>
                    <condition-list combine="and">
                         <condition-expr field-name="caContentIdTo" operator="equals" env-name="rsp.contentId" />
                         <condition-expr field-name="caContentAssocTypeId" operator="equals" value="RESPONSE" />
                         <condition-expr field-name="caThruDate" operator="equals" value=""/>
                    </condition-list> 
+                    <order-by field-name="caFromDate DESC"/>
                 </entity-condition>
             </sub-node>
         </node>