Fixes #3612, #3750. Added edit replies back to group plugin with the annotation menu.

2 files changed, 42 insertions, 7 deletions

diff --git a/mod/groups/views/default/annotation/group_topic_post.php b/mod/groups/views/default/annotation/group_topic_post.php
index d2303aba8..f38d2a77a 100644
--- a/mod/groups/views/default/annotation/group_topic_post.php
+++ b/mod/groups/views/default/annotation/group_topic_post.php
@@ -1,8 +1,19 @@
 <?php
-/**
- * Discussion reply
+/*
+ * Embeds an edit link for the annotation
  */
 
-$vars['delete_action'] = 'action/discussion/reply/delete';
+$annotation = elgg_extract('annotation', $vars);
 
 echo elgg_view('annotation/default', $vars);
+
+if ($annotation->canEdit()) {
+	$form = elgg_view_form('discussion/reply/save', array(), array_merge(array(
+			'entity' => get_entity($annotation->entity_guid),
+			'annotation' => $annotation
+		), $vars)
+	);
+
+	echo "<div class=\"hidden mbm\" id=\"edit-annotation-$annotation->id\">$form</div>";
+}
+
diff --git a/mod/groups/views/default/forms/discussion/reply/save.php b/mod/groups/views/default/forms/discussion/reply/save.php
index 40ea07303..083fefb78 100644
--- a/mod/groups/views/default/forms/discussion/reply/save.php
+++ b/mod/groups/views/default/forms/discussion/reply/save.php
@@ -6,7 +6,6 @@
  * @uses $vars['inline'] Display a shortened form?
  */
 
-
 if (isset($vars['entity']) && elgg_is_logged_in()) {
 	echo elgg_view('input/hidden', array(
 		'name' => 'entity_guid',
@@ -14,18 +13,43 @@ if (isset($vars['entity']) && elgg_is_logged_in()) {
 	));
 
 	$inline = elgg_extract('inline', $vars, false);
+
+	$annotation = elgg_extract('annotation', $vars);
+	
+	$value = '';
+
+	if ($annotation) {
+		$value = $annotation->value;
+		echo elgg_view('input/hidden', array(
+			'name' => 'annotation_id',
+			'value' => $annotation->id
+		));
+	}
+
 	if ($inline) {
-		echo elgg_view('input/text', array('name' => 'group_topic_post'));
+		echo elgg_view('input/text', array('name' => 'group_topic_post', 'value' => $value));
 		echo elgg_view('input/submit', array('value' => elgg_echo('reply')));
 	} else {
 ?>
 	<div>
-		<label><?php echo elgg_echo("reply"); ?></label>
-		<?php echo elgg_view('input/longtext', array('name' => 'group_topic_post')); ?>
+		<label>
+		<?php
+			if ($annotation) {
+				echo elgg_echo('edit');
+			} else {
+				echo elgg_echo("reply");
+			}
+		?>
+		</label>
+		<?php echo elgg_view('input/longtext', array('name' => 'group_topic_post', 'value' => $value)); ?>
 	</div>
 	<div class="elgg-foot">
 <?php
+	if ($annotation) {
+		echo elgg_view('input/submit', array('value' => elgg_echo('save')));
+	} else {
 		echo elgg_view('input/submit', array('value' => elgg_echo('reply')));
+	}
 ?>
 	</div>
 <?php