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

Some minor changes following Linton UI review

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2092 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gavin Cornwell
2006-01-10 12:30:11 +00:00
parent 69466598fc
commit 0d1d1aff57
3 changed files with 5 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/alfresco/messages/webclient.properties
View File

@@ -320,7 +320,7 @@ edit_topic_description=Modify the topic properties then click OK.
edit_post_description=Modify the message then click OK. edit_post_description=Modify the message then click OK.
edit_post_finish=To save the message click Post. edit_post_finish=To save the message click Post.
start_discussion=Start Discussion start_discussion=Start Discussion
discuss=Discuss discuss=View Discussions
discussion_for={0} discussion discussion_for={0} discussion
# Common Wizard messages # Common Wizard messages

2
config/alfresco/web-client-config.xml
View File

@@ -323,7 +323,7 @@
<config evaluator="string-compare" condition="Custom Folder Types"> <config evaluator="string-compare" condition="Custom Folder Types">
<folder-types> <folder-types>
<type name="fm:forums" icon="/images/icons/create_forums_large.gif" descriptionMsgId="forums_desc" /> <type name="fm:forums" icon="/images/icons/forums_large.gif" descriptionMsgId="forums_desc" />
</folder-types> </folder-types>
</config> </config>

23
source/java/org/alfresco/web/bean/ForumsBean.java
View File

@@ -697,27 +697,10 @@ public class ForumsBean implements IContextListener
// there should only be one child, retrieve it if there is // there should only be one child, retrieve it if there is
if (children.size() == 1) if (children.size() == 1)
{ {
// show the forum for the discussion
NodeRef forumNodeRef = children.get(0).getChildRef(); NodeRef forumNodeRef = children.get(0).getChildRef();
this.browseBean.clickSpace(forumNodeRef);
// query for the number of topics there are context.getApplication().getNavigationHandler().handleNavigation(context, null, "showForum");
String repliesXPath = "./*[(subtypeOf('" + ForumModel.TYPE_TOPIC + "'))]";
List<NodeRef> topics = searchService.selectNodes(forumNodeRef, repliesXPath,
new QueryParameterDefinition[] {}, this.namespaceService, false);
if (topics.size() == 1)
{
// if the forum has only one topic go straight into the topic by
// setting the context and navigating to it
NodeRef topicNodeRef = topics.get(0);
this.browseBean.clickSpace(topicNodeRef);
context.getApplication().getNavigationHandler().handleNavigation(context, null, "showTopic");
}
else
{
// if the forum has more than one topic we need to setup the context
// for the forum and navigate to the forum page
this.browseBean.clickSpace(forumNodeRef);
context.getApplication().getNavigationHandler().handleNavigation(context, null, "showForum");
}
} }
} }