Merged V2.2 to HEAD

10982: Merged V2.1 to V2.2
      10273: Fix for ETWOONE-317: Error from regenerate renditions wizard when templates are updated
   10985: Merged V2.1 to V2.2
      10717: Fix for ETWOONE-14: System Error message appears while clicking 'Manage Task' icon in ...
      10742: Fix for ETWOONE-119: A user created with space characters at the begin and at the end can't login
      10758: Fix for ETWOONE-183: URL addressability of forum spaces and topics
      10760: Fix for ETWOONE-339: URL Addressability to discussions causes display issue
      10761: Fix for ETWOONE-196: Attempt to post to the same forum by two or more users simultaneously leads to error appearance and impossibility to post for some of them
      10772: Fix for ETWOONE-225: Validation.js does not properly handle trailing whitespace
   10986: Added Hibernate src to Eclipse project
   11004: Remove annoying exceptions on shutdown
   11005: Minor javadoc fix
   11012: Fixed ETWOTWO-423: Optionally inject the Open Office document converter instance to the transformer


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@11202 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2008-10-06 11:22:26 +00:00
parent c9afa4a3c8
commit 09c1c23776
9 changed files with 317 additions and 14 deletions

View File

@@ -35,6 +35,7 @@ import java.util.Date;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
@@ -280,6 +281,9 @@ public class ForumsBean implements IContextListener
this.viewsConfig.getDefaultSortColumn(PAGE_NAME_FORUMS));
this.forumsRichList.setInitialSortDescending(
this.viewsConfig.hasDescendingSort(PAGE_NAME_FORUMS));
// ETWOONE-183 & ETWOONE-339. For URL addressability of forums spaces
this.forumsRichList.setRefreshOnBind(true);
}
}
@@ -337,6 +341,9 @@ public class ForumsBean implements IContextListener
this.viewsConfig.getDefaultSortColumn(PAGE_NAME_TOPIC));
this.topicRichList.setInitialSortDescending(
this.viewsConfig.hasDescendingSort(PAGE_NAME_TOPIC));
// ETWOONE-183. For URL addressability of topics:
this.topicRichList.setRefreshOnBind(true);
}
}
@@ -394,6 +401,9 @@ public class ForumsBean implements IContextListener
this.viewsConfig.getDefaultSortColumn(PAGE_NAME_FORUM));
this.forumRichList.setInitialSortDescending(
this.viewsConfig.hasDescendingSort(PAGE_NAME_FORUM));
// ETWOONE-183 & ETWOONE-339. For URL addressability of forum spaces
this.forumRichList.setRefreshOnBind(true);
}
}
@@ -928,6 +938,10 @@ public class ForumsBean implements IContextListener
SimpleDateFormat dateFormat = new SimpleDateFormat("dd-MM-yyyy-HH-mm-ss");
name.append(dateFormat.format(new Date()));
// add Universal Unique Identifier
// fix bugs ETWOONE-196 and ETWOONE-203
name.append("-" + UUID.randomUUID());
// add the HTML file extension
name.append(".html");