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

- inserted new blog icons

Browse Source 
- fixes for top search bar, but icons still not correctly layed out
- fixed blog/discussion REST API unit tests
- fix for broken external blog config dialog
- documentlibrary activity now produces correct download url for files (filename at the end of the url was missing)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10001 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Michael Ru
2008-07-24 09:45:06 +00:00
parent a451555bac
commit 0af3358015
3 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
config/alfresco/templates/webscripts/org/alfresco/repository/blogs/blogpost.lib.js
View File

@@ -68,8 +68,15 @@ function getBlogPostData(node)
} }
// does the external post require an update? // does the external post require an update?
if ((node.properties["blg:lastUpdate"] != undefined)) if (node.hasAspect(ASPECT_RELEASED) && (node.properties["blg:lastUpdate"] != undefined))
{ {
// we either use the release or updated date
var modifiedDate = data.releaseDate;
if (data.updatedDate != undefined)
{
modifiedDate = data.updatedDate;
}
if ((modifiedDate - node.properties["blg:lastUpdate"]) > 5000) if ((modifiedDate - node.properties["blg:lastUpdate"]) > 5000)
{ {
data.outOfDate = true; data.outOfDate = true;

8
source/java/org/alfresco/repo/web/scripts/blog/BlogServiceTest.java
View File

@@ -62,8 +62,8 @@ public class BlogServiceTest extends BaseWebScriptTest
private static final String SITE_SHORT_NAME_BLOG = "BlogSiteShortName"; private static final String SITE_SHORT_NAME_BLOG = "BlogSiteShortName";
private static final String COMPONENT_BLOG = "blog"; private static final String COMPONENT_BLOG = "blog";
private static final String URL_BLOG_POST = "/blog/post/site/" + SITE_SHORT_NAME_BLOG + "/" + COMPONENT_BLOG + "/"; private static final String URL_BLOG_POST = "/api/blog/post/site/" + SITE_SHORT_NAME_BLOG + "/" + COMPONENT_BLOG + "/";
private static final String URL_BLOG_POSTS = "/blog/site/" + SITE_SHORT_NAME_BLOG + "/" + COMPONENT_BLOG + "/posts"; private static final String URL_BLOG_POSTS = "/api/blog/site/" + SITE_SHORT_NAME_BLOG + "/" + COMPONENT_BLOG + "/posts";
private List<String> posts = new ArrayList<String>(5); private List<String> posts = new ArrayList<String>(5);
private List<String> drafts = new ArrayList<String>(5); private List<String> drafts = new ArrayList<String>(5);
@@ -224,12 +224,12 @@ public class BlogServiceTest extends BaseWebScriptTest
private String getCommentsUrl(String nodeRef) private String getCommentsUrl(String nodeRef)
{ {
return "/node/" + nodeRef.replace("://", "/") + "/comments"; return "/api/node/" + nodeRef.replace("://", "/") + "/comments";
} }
private String getCommentUrl(String nodeRef) private String getCommentUrl(String nodeRef)
{ {
return "/comment/node/" + nodeRef.replace("://", "/"); return "/api/comment/node/" + nodeRef.replace("://", "/");
} }
private JSONObject createComment(String nodeRef, String title, String content, int expectedStatus) private JSONObject createComment(String nodeRef, String title, String content, int expectedStatus)

8
source/java/org/alfresco/repo/web/scripts/discussion/DiscussionServiceTest.java
View File

@@ -61,8 +61,8 @@ public class DiscussionServiceTest extends BaseWebScriptTest
private static final String SITE_SHORT_NAME_DISCUSSION = "DiscussionSiteShortName"; private static final String SITE_SHORT_NAME_DISCUSSION = "DiscussionSiteShortName";
private static final String COMPONENT_DISCUSSION = "discussion"; private static final String COMPONENT_DISCUSSION = "discussion";
private static final String URL_FORUM_POST = "/forum/post/site/" + SITE_SHORT_NAME_DISCUSSION + "/" + COMPONENT_DISCUSSION + "/"; private static final String URL_FORUM_POST = "/api/forum/post/site/" + SITE_SHORT_NAME_DISCUSSION + "/" + COMPONENT_DISCUSSION + "/";
private static final String URL_FORUM_POSTS = "/forum/site/" + SITE_SHORT_NAME_DISCUSSION + "/" + COMPONENT_DISCUSSION + "/posts"; private static final String URL_FORUM_POSTS = "/api/forum/site/" + SITE_SHORT_NAME_DISCUSSION + "/" + COMPONENT_DISCUSSION + "/posts";
private List<String> posts = new ArrayList<String>(5); private List<String> posts = new ArrayList<String>(5);
@@ -194,12 +194,12 @@ public class DiscussionServiceTest extends BaseWebScriptTest
private String getRepliesUrl(String nodeRef) private String getRepliesUrl(String nodeRef)
{ {
return "/forum/post/node/" + nodeRef.replace("://", "/") + "/replies"; return "/api/forum/post/node/" + nodeRef.replace("://", "/") + "/replies";
} }
private String getPostUrl(String nodeRef) private String getPostUrl(String nodeRef)
{ {
return "/forum/post/node/" + nodeRef.replace("://", "/"); return "/api/forum/post/node/" + nodeRef.replace("://", "/");
} }
private JSONObject createReply(String nodeRef, String title, String content, int expectedStatus) private JSONObject createReply(String nodeRef, String title, String content, int expectedStatus)