inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-21 18:09:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V4.1-BUG-FIX to HEAD

Browse Source 
39199: Fixed ALF-13252 "Share - Added aspects are not shown in folder properties"
   39235: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2012_07_09 to BRANCHES/DEV/V4.1-BUG-FIX:
      38994: ALF-14983 : Upgrade scripts to increase column sizes for Activiti
      39052: ALF-14983 : Upgrade scripts to increase column sizes for Activiti
      (note: reviewed and merged, including required merge ghanges to .sql, .properties, .xml for schema number update 5111 -> 5112)
   39239: ALF-14111 CLONE - 60k sites: Groups are not displayed in all supported browsers when 60k sites and 60 groups in the system
      - Code works on 3.4 as it includes a fix for ALF-7604 (3.4.2).
      - V4.1 should also have this fix (but did not) as there was a clone ALF-7734 (of ALF-7604) applied to Team that
        was merged to HEAD (and hence 4.x). The merge to HEAD failed to include this fix.
      - Putting this code back into 4.1.1 - this should correct this issue (ALF-14111) as the code will no longer have to sort
        240,000 groups when there are 60,000 user created groups. 
   39257: ALF-10730: Fall back on parentType for icons if necessary
   39307: Fix for ALF-14799 - jsonUtils.toJSONString() outputs long values as floating-point numbers
    - Updated to latest Surf libs rev 1101 which fixes this issue
   39310: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2012_07_09 to BRANCHES/DEV/V4.1-BUG-FIX
      39071: ALF-13767: User error messages in org.alfresco.repo.web.scripts are all hardcoded and cannot be localised
             Modify Java backed webscripts to return localised messages to model.
   39345: Impl from Shane Frensley to fix ALF-3484 - Alfresco should show meaningful error message when deleted item recovery fails.
   39362: RECORD ONLY MERGE from V3.4-BUG-FIX to V4.1-BUG-FIX
      39360: <<DO NOT MERGE TO V4.1-BUG-FIX>>
      Remove the creation of OSX installers - we will never need them any more since they are neither distributed not trialled
   39416: Fix for ALF-14466 Share Document Library breaks for obscure control character in document title
   39594: Minor formatting tweak for coding standards consistency.
   39622: ALF-9254: Merged V3.4-BUG-FIX (3.4.11) to V4.1-BUG-FIX (4.1.1)
      39605: ALF-15227 3.4 CLONE - Alfresco incapable of previewing text files including non Western European characters without custom configuration 
         - transformer.PdfBox.TextToPdf no longer does txt to pdf transform as OOo/JOD handles non western chars better and are not that
           much slower even for western encodings
           - It still does csv and xml to pdf
           - transformer.complex.Text.Pdf2swf now has a wild card first transformer for text to pdf (rather than transformer.PdfBox.TextToPdf)
             The 2nd transform is still transformer.Pdf2swf. As a result transformer.PdfBox.TextToPdf or the OOo/JOD transformers may be used.
           - transformer.complex.Archive.Pdf2swf now has a wild card first transformer for the same reason.
           - transformer.complex.Text.Image now has a wild card first transformer for the same reason.
         - Allow transformer config element supportedTransformations to wild card source or target mimetype
   39692: ALF-9254: Merged V3.4-BUG-FIX (3.4.11) to V4.1-BUG-FIX (4.1.1)
      39679: ALF-15227 3.4 CLONE - Alfresco incapable of previewing text files including non Western European characters without custom configuration 
         - Fix build failures (not sure about RecordsManagementAuditServiceImplTest)
         - Reset some of the text to pdf / swf limits now OOo or JOD is used rather than PDFBox
   39719: ALF-13037: Ensure that doclist is refreshed when on edit properties triggered folder rule that causes documents to be moved
   39734: Improvements to reduce need to index Surf component XML files - parent config folders already dealt with, but this removes the burden of indexing the XML content. (ALF-10826)
   39740: Merged BRANCHES/V4.1 to BRANCHES/DEV/V4.1-BUG-FIX: (record-only - already present)
      39734: Improvements to reduce need to index Surf component XML files - parent config folders already dealt with, but this removes the burden of indexing the XML content.
   39779: Merged V3.4-BUG-FIX to V4.1-BUG-FIX (RECORD ONLY)
      39774: ALF-15262: Merged V4.0-BUG-FIX to V3.4-BUG-FIX
         35738: Merged HEAD to BRANCHES/DEV/V4.0-BUG-FIX:
            35737: Fix for ALF-11923. Linked rules can't be deleted if source folder was deleted.
         35751: Addendum to fix for ALF-11923. Fixing failing test case by tightening up delete behaviour.
            I also fixed the @since annotations from Odin to 3.4.11
      39777: ALF-15262: Fixed compilation error by re-introducing typo in method name!
   39784: Merged BRANCHES/V4.1 to BRANCHES/DEV/V4.1-BUG-FIX (RECORD ONLY)
      39775: ALF-15271: "Site Content" dashlet shows all documents from all the sites in Alfresco Share
   39831: Merged V3.4-BUG-FIX to V4.1-BUG-FIX (4.1.1)
      39015: Merged in upgrade of truezip to 7.5.5 see ALF-14247
      39361: Added truezip-swing jar.  It seems that Truezip needs Swing :(


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@40265 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
2012-08-09 16:37:33 +00:00
parent 662a96729b
commit 34232096c4
23 changed files with 100 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
source/java/org/alfresco/repo/web/scripts/discussion/ForumPostDelete.java
View File

@@ -18,7 +18,9 @@
*/
package org.alfresco.repo.web.scripts.discussion;
import java.text.MessageFormat;
import java.util.Map;
import java.util.ResourceBundle;
import org.alfresco.service.cmr.discussion.PostInfo;
import org.alfresco.service.cmr.discussion.TopicInfo;
@@ -38,6 +40,8 @@ import org.springframework.extensions.webscripts.WebScriptRequest;
*/
public class ForumPostDelete extends AbstractDiscussionWebScript
{
private static final String MSG_NODE_MARKED_REMOVED = "forum-post.msg.marked.removed";
private static final String MSG_NODE_DELETED = "forum-post.msg.deleted";
private static final String DELETED_POST_TEXT = "[[deleted]]";
@Override
@@ -45,6 +49,8 @@ public class ForumPostDelete extends AbstractDiscussionWebScript
TopicInfo topic, PostInfo post, WebScriptRequest req, JSONObject json,
Status status, Cache cache)
{
final ResourceBundle rb = getResources();
// Build the common model parts
Map<String, Object> model = buildCommonModel(site, topic, post, req);
@@ -53,11 +59,11 @@ public class ForumPostDelete extends AbstractDiscussionWebScript
String message = null;
if (post != null)
{
message = doDeletePost(topic, post);
message = doDeletePost(topic, post, rb);
}
else if (topic != null)
{
message = doDeleteTopic(topic, site, req, json);
message = doDeleteTopic(topic, site, req, json, rb);
}
else
{
@@ -72,7 +78,7 @@ public class ForumPostDelete extends AbstractDiscussionWebScript
}
private String doDeleteTopic(TopicInfo topic, SiteInfo site,
WebScriptRequest req, JSONObject json)
WebScriptRequest req, JSONObject json, ResourceBundle rb)
{
// Delete the topic, which removes all its posts too
discussionService.deleteTopic(topic);
@@ -84,7 +90,9 @@ public class ForumPostDelete extends AbstractDiscussionWebScript
}
// All done
return "Node " + topic.getNodeRef() + " deleted";
String message = rb.getString(MSG_NODE_DELETED);
return MessageFormat.format(message, topic.getNodeRef());
}
/**
@@ -94,7 +102,7 @@ public class ForumPostDelete extends AbstractDiscussionWebScript
* text contents.
* TODO If a post has no replies, then delete it fully
*/
private String doDeletePost(TopicInfo topic, PostInfo post)
private String doDeletePost(TopicInfo topic, PostInfo post, ResourceBundle rb)
{
// Set the marker text and save
post.setTitle(DELETED_POST_TEXT);
@@ -104,6 +112,7 @@ public class ForumPostDelete extends AbstractDiscussionWebScript
// Note - we don't add activity feed entries for deleted posts
// Only deleted whole topic qualify for that at the moment
return "Node " + post.getNodeRef() + " marked as removed";
String message = rb.getString(MSG_NODE_MARKED_REMOVED);
return MessageFormat.format(message, post.getNodeRef());
}
}