Forum

Reihenfolge der Threads ist nun per Config einstellbar.

git-svn-id: https://svn.libreccm.org/ccm/trunk@1474 8810af33-2d31-482b-a856-94f89814c4df

ccm-forum/src/com/arsdigita/forum/Forum.java

@@ -597,7 +597,7 @@ public class Forum extends Application {
             }
         }
 
-        threadsData.addOrder("lastUpdate desc");
+        threadsData.addOrder(getConfig().getThreadOrder());
 
         return new ThreadCollection(threadsData);
     }

ccm-forum/src/com/arsdigita/forum/ForumConfig.java

@@ -46,7 +46,6 @@ import org.apache.log4j.Logger;
 public class ForumConfig extends AbstractConfig {
 
     private static final Logger s_log = Logger.getLogger(ForumConfig.class);
-
     private Parameter m_adminEditPosts;
     private Parameter m_authorEditPosts;
     private Parameter m_authorDeletePosts;
@@ -62,6 +61,8 @@ public class ForumConfig extends AbstractConfig {
     private Parameter m_useWysiwygEditor;
     private Parameter m_rejectionMessage;
     private Parameter m_threadPageSize;
+    private Parameter m_threadOrderField;
+    private Parameter m_threadOrderDir;
     private Parameter m_quickFinish;
     private Parameter m_deleteSentSubscriptionNotifications;
 
@@ -87,19 +88,19 @@ public class ForumConfig extends AbstractConfig {
                 "com.arsdigita.forum.digest_user_email",
                 Parameter.OPTIONAL,
                 null);
-        m_disablePageCaching = new BooleanParameter (
+        m_disablePageCaching = new BooleanParameter(
                 "com.arsdigita.forum.disable_page_caching",
                 Parameter.REQUIRED,
                 Boolean.FALSE);
 
-        m_adminOnlyCreateTopics = new BooleanParameter (
+        m_adminOnlyCreateTopics = new BooleanParameter(
                 "com.arsdigita.forum.admin_only_to_create_topics",
                 Parameter.REQUIRED,
                 Boolean.FALSE);
-	    m_maxImageSize = new IntegerParameter (
+        m_maxImageSize = new IntegerParameter(
                 "com.arsdigita.forum.maximum_image_size",
                 Parameter.OPTIONAL, null);
-	    m_maxFileSize = new IntegerParameter (
+        m_maxFileSize = new IntegerParameter(
                 "com.arsdigita.forum.maximum_file_size",
                 Parameter.OPTIONAL, null);
 
@@ -119,9 +120,15 @@ public class ForumConfig extends AbstractConfig {
                 "com.arsdigita.forum.rejection_form_message.example",
                 Parameter.OPTIONAL,
                 null);
-        m_threadPageSize = new IntegerParameter (
+        m_threadPageSize = new IntegerParameter(
                 "com.arsdigita.forum.thread_page_size",
                 Parameter.REQUIRED, new Integer(10));
+        m_threadOrderField = new StringParameter(
+                "com.arsdigita.forum.thread_order_field",
+                Parameter.REQUIRED, new String("lastUpdate"));
+        m_threadOrderDir = new StringParameter(
+                "com.arsdigita.forum.thread_order_dir",
+                Parameter.REQUIRED, new String("desc"));
         m_quickFinish = new BooleanParameter(
                 "com.arsdigita.forum.allow_quick_finish",
                 Parameter.OPTIONAL,
@@ -131,8 +138,7 @@ public class ForumConfig extends AbstractConfig {
                 Parameter.OPTIONAL,
                 Boolean.FALSE);
 
-        m_adapters = new ResourceParameter
+        m_adapters = new ResourceParameter("com.arsdigita.forum.traversal_adapters",
-            ("com.arsdigita.forum.traversal_adapters",
                 Parameter.REQUIRED,
                 "/WEB-INF/resources/forum-adapters.xml");
 
@@ -151,29 +157,31 @@ public class ForumConfig extends AbstractConfig {
         register(m_useWysiwygEditor);
         register(m_rejectionMessage);
         register(m_threadPageSize);
+        register(m_threadOrderField);
+        register(m_threadOrderDir);
         register(m_quickFinish);
         register(m_deleteSentSubscriptionNotifications);
         loadInfo();
     }
 
     InputStream getTraversalAdapters() {
-        return (InputStream)get(m_adapters);
+        return (InputStream) get(m_adapters);
     }
 
     public boolean canAdminEditPosts() {
-        return ((Boolean)get(m_adminEditPosts)).booleanValue();
+        return ((Boolean) get(m_adminEditPosts)).booleanValue();
     }
 
     public boolean canAuthorEditPosts() {
-        return ((Boolean)get(m_authorEditPosts)).booleanValue();
+        return ((Boolean) get(m_authorEditPosts)).booleanValue();
     }
 
     boolean canAuthorDeletePosts() {
-        return ((Boolean)get(m_authorDeletePosts)).booleanValue();
+        return ((Boolean) get(m_authorDeletePosts)).booleanValue();
     }
 
     public String getDigestUserEmail() {
-        String email = (String)get(m_digestUserEmail);
+        String email = (String) get(m_digestUserEmail);
         if (email == null) {
             email = "forum-robot@" + Web.getConfig().getServer().getName();
         }
@@ -181,7 +189,7 @@ public class ForumConfig extends AbstractConfig {
     }
 
     public String getReplyHostName() {
-        String hostName = (String)get(m_replyHostName);
+        String hostName = (String) get(m_replyHostName);
         if (hostName == null) {
             hostName = Web.getConfig().getServer().getName();
         }
@@ -189,27 +197,28 @@ public class ForumConfig extends AbstractConfig {
     }
 
     /**
-     * Supports prevention of client and middleware caching - 
+     * Supports prevention of client and middleware caching - use in situations
-     * use in situations where users with different 
+     * where users with different permissions share machines
-     * permissions share machines
+     *
      * @return
      */
-    public boolean disableClientPageCaching () {
+    public boolean disableClientPageCaching() {
-    	return ((Boolean)get(m_disablePageCaching)).booleanValue();
+        return ((Boolean) get(m_disablePageCaching)).booleanValue();
     }
 
     /**
-     * if true, disables topic tab for non admin users. Topic
+     * if true, disables topic tab for non admin users. Topic tab does not
-     * tab does not access control topic creation, so set this 
+     * access control topic creation, so set this to true to maintain control of
-     * to true to maintain control of the topics on the forum.
+     * the topics on the forum.
      *
      *
      *
      * @return
      */
-    public boolean topicCreationByAdminOnly () {
+    public boolean topicCreationByAdminOnly() {
-		return ((Boolean)get(m_adminOnlyCreateTopics)).booleanValue();
+        return ((Boolean) get(m_adminOnlyCreateTopics)).booleanValue();
     }
+
     public User getDigestUser() {
         String email = getDigestUserEmail();
 
@@ -225,28 +234,30 @@ public class ForumConfig extends AbstractConfig {
         users.close();
         return user;
     }
+
     /**
-     * returns the maximum allowed size (in bytes) of 
+     * returns the maximum allowed size (in bytes) of image files attached to
-     * image files attached to posts. Any larger
+     * posts. Any larger files are rejected by UI validation
-     * files are rejected by UI validation 
+     *
      * @return
      */
     public long getMaxImageSize() {
-    	Integer size = (Integer)get(m_maxImageSize);
+        Integer size = (Integer) get(m_maxImageSize);
         long longSize = Long.MAX_VALUE;
         if (size != null) {
             longSize = size.longValue();
         }
         return longSize;
     }
+
     /**
-     * returns the maximum allowed size (in bytes) of 
+     * returns the maximum allowed size (in bytes) of files attached to posts.
-     * files attached to posts. Any larger
+     * Any larger files are rejected by UI validation
-     * files are rejected by UI validation 
+     *
      * @return
      */
     public long getMaxFileSize() {
-	Integer size = (Integer)get(m_maxFileSize);
+        Integer size = (Integer) get(m_maxFileSize);
         long longSize = Long.MAX_VALUE;
         if (size != null) {
             longSize = size.longValue();
@@ -254,56 +265,71 @@ public class ForumConfig extends AbstractConfig {
         return longSize;
     }
 
-		
     /**
-     * if true, alerts tab displays thread alerts for this and all other
+     * if true, alerts tab displays thread alerts for this and all other forums.
-     * forums. If false, only display thread subscriptions for current 
+     * If false, only display thread subscriptions for current forum.
-     * forum.
+     *
      * @return
      */
     /*
-     * If true, the thread alert page lists thread alerts from 
+     * If true, the thread alert page lists thread alerts from all forums -
-     * all forums - alerts not from the current forum have
+     * alerts not from the current forum have links to the thread displayed
-     * links to the thread displayed within the context of 
+     * within the context of the current forum. Looks weird and needs to be
-     * the current forum. Looks weird and needs to be sorted out
+     * sorted out presumably the correct forum needs to be set in the
-     * presumably the correct forum needs to be set in the ForumContext 
+     * ForumContext when a link is selected
-     * when a link is selected
      */
-    public boolean showThreadAlertsForAllForums () {
+    public boolean showThreadAlertsForAllForums() {
-    	return ((Boolean)get(m_showAllThreadAlerts)).booleanValue();
+        return ((Boolean) get(m_showAllThreadAlerts)).booleanValue();
-    }
-    /**
-     * if true, displays setup and permissions tabs
-     * @return
-     */
-    public boolean showNewTabs () {
-    	return ((Boolean)get(m_showNewTabs)).booleanValue();
-    } 
-    
-    public boolean useWysiwygEditor () {
-    	return ((Boolean)get(m_useWysiwygEditor)).booleanValue();
     }
 
     /**
-     * message added to the bottom of the moderation reection email. 
+     * if true, displays setup and permissions tabs
-     * May give details about what the poster can do if not happy 
+     *
-     * with rejection
      * @return
      */
-    public String getRejectionMessage () {
+    public boolean showNewTabs() {
-    	return (String)get(m_rejectionMessage);
+        return ((Boolean) get(m_showNewTabs)).booleanValue();
     }
 
-    public int getThreadPageSize () {
+    public boolean useWysiwygEditor() {
-    	return ((Integer)get(m_threadPageSize)).intValue();
+        return ((Boolean) get(m_useWysiwygEditor)).booleanValue();
     }
 
-    public boolean quickFinishAllowed () {
+    /**
-    	return ((Boolean)get(m_quickFinish)).booleanValue();
+     * message added to the bottom of the moderation reection email. May give
+     * details about what the poster can do if not happy with rejection
+     *
+     * @return
+     */
+    public String getRejectionMessage() {
+        return (String) get(m_rejectionMessage);
     }
 
-    public boolean deleteNotifications () {
+    public int getThreadPageSize() {
-    	return ((Boolean)get(m_deleteSentSubscriptionNotifications)).booleanValue();
+        return ((Integer) get(m_threadPageSize)).intValue();
     }
 
+    public String getThreadOrder() {
+        String field = (String) get(m_threadOrderField);
+        String dir = (String) get(m_threadOrderDir);
+
+        // Test for validity
+        if(!field.equals("lastUpdate") && !field.equals("root.sent")) {
+            field = "lastUpdate"; // Default behaviour
+        }
+
+        if(!dir.equals("asc") && !dir.equals("desc")) {
+            dir = "desc"; // Default behaviour
+        }
+
+        return field + " " + dir;
+    }
+
+    public boolean quickFinishAllowed() {
+        return ((Boolean) get(m_quickFinish)).booleanValue();
+    }
+
+    public boolean deleteNotifications() {
+        return ((Boolean) get(m_deleteSentSubscriptionNotifications)).booleanValue();
+    }
 }

ccm-forum/src/com/arsdigita/forum/ForumConfig_parameter.properties

@@ -73,6 +73,16 @@ com.arsdigita.forum.thread_page_size.purpose=balance page loading time against n
 com.arsdigita.forum.thread_page_size.format=[integer]
 com.arsdigita.forum.thread_page_size.example=10
 
+com.arsdigita.forum.thread_order_field.title=Thread list order field
+com.arsdigita.forum.thread_order_field.purpose=Define field by which the thread list will be orderd
+com.arsdigita.forum.thread_order_field.format=[string]
+com.arsdigita.forum.thread_order_field.example=lastUpdate|root.sent
+
+com.arsdigita.forum.thread_order_dir.title=Thread list order direction
+com.arsdigita.forum.thread_order_dir.purpose=Ascending or descending sort order
+com.arsdigita.forum.thread_order_dir.format=[string]
+com.arsdigita.forum.thread_order_dir.example=asc|desc
+
 com.arsdigita.forum.allow_quick_finish.title=Allow quick finish on posts
 com.arsdigita.forum.allow_quick_finish.purpose=To give users the option of omitting post steps if they have a quick text post
 com.arsdigita.forum.allow_quick_finish.format=[boolean]

ccm-forum/src/com/arsdigita/forum/ui/ForumResources_de.properties

@@ -18,7 +18,7 @@ forum.ui.no=Nein
 
 forum.ui.thread.newPost=Neuer Beitrag
 forum.ui.thread.subscribe=Beitrag abonnieren
-forum.ui.thread.unsubscribe=Beitrag Abonoment stornieren
+forum.ui.thread.unsubscribe=Beitrag Abonnement stornieren
 forum.ui.thread.viewAll=Alle Beitr\u00e4ge
 
 forum.ui.topic.description=Beschreibung