From 856dc92ef07c9fe06339349224533a12898b31d7 Mon Sep 17 00:00:00 2001 From: dave Date: Sat, 19 Jun 2010 16:31:35 +0000 Subject: There was no point in group discussions having their own comment annotations, better to use the generic comments so this has been changed and a full group activity stream added. For v1.8, there will need to be an upgrade script which will change 'group_topic_post' -> 'generic_comment' and on all existing topics, take the first annotation of type 'group_topic_post' and populate the topic's description. git-svn-id: http://code.elgg.org/elgg/trunk@6526 36083f99-b078-4883-b0ff-0f9b5a30f544 --- mod/groups/views/default/river/forum/topic/create.php | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'mod/groups/views/default/river/forum') diff --git a/mod/groups/views/default/river/forum/topic/create.php b/mod/groups/views/default/river/forum/topic/create.php index 0b65f79b6..fb2a3556d 100644 --- a/mod/groups/views/default/river/forum/topic/create.php +++ b/mod/groups/views/default/river/forum/topic/create.php @@ -7,19 +7,20 @@ $group_guid = $object->container_guid; $group = get_entity($group_guid); $url = $vars['url'] . "mod/groups/topicposts.php?topic=" . $forumtopic . "&group_guid=" . $group_guid; - $comment = $object->getAnnotations("group_topic_post", 1, 0, "asc"); - foreach($comment as $c){ - $contents = $c->value; - } + //$comment = $object->getAnnotations("group_topic_post", 1, 0, "asc"); + //foreach($comment as $c){ + $contents = $object->description; + //} $contents = strip_tags($contents);//this is so we don't get large images etc in the activity river $url_user = "getURL()}\">{$performed_by->name}"; $string = sprintf(elgg_echo("groupforum:river:postedtopic"),$url_user) . ": "; $string .= "" . $object->title . ""; - if(get_context() != 'groups'){ - $string .= " " . elgg_echo('groups:ingroup') . " getURL()}\">" . $group->name . ""; + $string .= " " . elgg_echo('groups:ingroup') . " getURL()}\">" . $group->name . ""; + $string .= " ". friendly_time($object->time_created) .""; + if (isloggedin() && $object->status != "closed") { + $string .= '' . elgg_echo('generic_comments:text') . ''; + $string .= elgg_view('likes/forms/link', array('entity' => $object)); } - $string .= " ". friendly_time($object->time_created) ." Visit discussion"; - $string .= elgg_view('likes/forms/link', array('entity' => $object)); $string .= "
"; $string .= elgg_make_excerpt($contents, 200); $string .= "
"; -- cgit v1.2.3