From bddf65c48ff6b825b0a230d2fd873369c9d07ffd Mon Sep 17 00:00:00 2001
From: Damien Regad <dregad@mantisbt.org>
Date: Fri, 9 Jun 2017 22:29:46 +0200
Subject: [PATCH 1/3] Display related issues on changesets list page

---
 Source/Source.ViewAPI.php | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/Source/Source.ViewAPI.php b/Source/Source.ViewAPI.php
index 6aa5d3836..b1dfe026f 100644
--- a/Source/Source.ViewAPI.php
+++ b/Source/Source.ViewAPI.php
@@ -26,6 +26,7 @@ function Source_View_Changesets( $p_changesets, $p_repos=null, $p_show_repos=tru
 		$t_repo = $t_repos[ $t_changeset->repo_id ];
 		$t_vcs = SourceVCS::repo( $t_repo );
 
+		$t_changeset->load_bugs();
 		$t_changeset->load_files();
 
 		$t_author = Source_View_Author( $t_changeset, false );
@@ -63,7 +64,7 @@ function Source_View_Changesets( $p_changesets, $p_repos=null, $p_show_repos=tru
 		<?php }
 		?>
 </td>
-<td colspan="3"><?php
+<td colspan="2"><?php
 	# The commit message is manually transformed (adding href, bug and bugnote
 	# links + nl2br) instead of calling string_display_links(), which avoids
 	# unwanted html tags processing by the MantisCoreFormatting plugin.
@@ -75,7 +76,21 @@ function Source_View_Changesets( $p_changesets, $p_repos=null, $p_show_repos=tru
 					string_insert_hrefs(
 						string_html_specialchars( $t_changeset->message )
 		) ) ) );
-?></td>
+	?>
+</td>
+<td>
+	<span class="bold"><?php
+		echo plugin_lang_get( 'affected_issues' );
+		?>
+	</span>
+	<br>
+	<span><?php
+		# Print list of related issues with link
+		$t_bugs = array_map( 'string_get_bug_view_link', $t_changeset->bugs );
+		echo $t_bugs ? implode( ', ', $t_bugs ) : lang_get( 'none' );
+		?>
+	</span>
+</td>
 </tr>
 
 		<?php foreach ( $t_changeset->files as $t_file ) { ?>

From 3433e49952708986860abe77b197289063b2bcc6 Mon Sep 17 00:00:00 2001
From: Damien Regad <dregad@mantisbt.org>
Date: Fri, 9 Jun 2017 22:55:25 +0200
Subject: [PATCH 2/3] Allow attaching issues from changeset list page

If there are no issues linked to the changeset, display an input field
and button to allow the user to add links without having to open the
changeset view page.
---
 Source/Source.ViewAPI.php | 34 +++++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/Source/Source.ViewAPI.php b/Source/Source.ViewAPI.php
index b1dfe026f..1c9c36782 100644
--- a/Source/Source.ViewAPI.php
+++ b/Source/Source.ViewAPI.php
@@ -79,24 +79,36 @@ function Source_View_Changesets( $p_changesets, $p_repos=null, $p_show_repos=tru
 	?>
 </td>
 <td>
-	<span class="bold"><?php
-		echo plugin_lang_get( 'affected_issues' );
-		?>
-	</span>
-	<br>
-	<span><?php
-		# Print list of related issues with link
+<?php
+		# Build list of related issues with link
 		$t_bugs = array_map( 'string_get_bug_view_link', $t_changeset->bugs );
-		echo $t_bugs ? implode( ', ', $t_bugs ) : lang_get( 'none' );
-		?>
-	</span>
+
+		if( $t_bugs ) {
+			echo '<span class="bold">',
+				plugin_lang_get( 'affected_issues' ),
+				'</span><br>';
+			echo '<span>', implode( ', ', $t_bugs ), '</span>';
+		} else {
+?>
+		<form action="<?php echo plugin_page( 'attach' )  ?>" method="post">
+			<?php echo form_security_field( 'plugin_Source_attach' ) ?>
+			<input type="hidden" name="id" value="<?php echo $t_changeset->id ?>"/>
+			<?php echo plugin_lang_get( 'attach_to_issue' ) ?><br>
+			<input type="text" class="input-sm" name="bug_ids" size="12"/>
+			<input type="submit"
+                   class="btn btn-sm btn-primary btn-white btn-round"
+                   value="<?php echo plugin_lang_get( 'attach' ) ?>"/>
+		</form>
+<?php
+		}
+?>
 </td>
 </tr>
 
 		<?php foreach ( $t_changeset->files as $t_file ) { ?>
 <tr>
 <td class="small" colspan="2"><?php echo string_display_line( $t_vcs->show_file( $t_repo, $t_changeset, $t_file ) ) ?></td>
-<td class="center" width="12%">
+<td class="center" width="15%">
 		<?php
 		if ( $t_url = $t_vcs->url_diff( $t_repo, $t_changeset, $t_file ) ) { ?>
 			<a class="btn btn-xs btn-primary btn-white btn-round" href="<?php echo $t_url ?>">

From 875c09242873fb55d29fc4778becaa6df5b13a5f Mon Sep 17 00:00:00 2001
From: Damien Regad <dregad@mantisbt.org>
Date: Sat, 10 Jun 2017 00:27:43 +0200
Subject: [PATCH 3/3] Redirect back to list page after linking issues

Use changeset's revision id as anchor in the changesets list, and use
that as a new 'redirect' parameter for the attach page so it returns
straight to the changeset list's row that called it.

If the new param is not specified, the behavior is as it was before,
i.e. redirect to view page.
---
 Source/Source.ViewAPI.php |  6 ++++--
 Source/pages/attach.php   | 14 +++++++++++++-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/Source/Source.ViewAPI.php b/Source/Source.ViewAPI.php
index 1c9c36782..39da71d50 100644
--- a/Source/Source.ViewAPI.php
+++ b/Source/Source.ViewAPI.php
@@ -36,6 +36,7 @@ function Source_View_Changesets( $p_changesets, $p_repos=null, $p_show_repos=tru
 <tr>
 
 <td class="category" width="25%" rowspan="<?php echo count( $t_changeset->files ) + 1 ?>">
+	<a id="<?php echo $t_changeset->revision; ?>"></a>
 	<p class="no-margin" name="changeset<?php echo $t_changeset->id ?>"><?php echo string_display(
 		( $p_show_repos ? $t_repo->name . ': ' : '' ) .
 		$t_vcs->show_changeset( $t_repo, $t_changeset )
@@ -93,11 +94,12 @@ function Source_View_Changesets( $p_changesets, $p_repos=null, $p_show_repos=tru
 		<form action="<?php echo plugin_page( 'attach' )  ?>" method="post">
 			<?php echo form_security_field( 'plugin_Source_attach' ) ?>
 			<input type="hidden" name="id" value="<?php echo $t_changeset->id ?>"/>
+			<input type="hidden" name="redirect" value="<?php echo $t_changeset->revision ?>"/>
 			<?php echo plugin_lang_get( 'attach_to_issue' ) ?><br>
 			<input type="text" class="input-sm" name="bug_ids" size="12"/>
 			<input type="submit"
-                   class="btn btn-sm btn-primary btn-white btn-round"
-                   value="<?php echo plugin_lang_get( 'attach' ) ?>"/>
+				   class="btn btn-sm btn-primary btn-white btn-round"
+				   value="<?php echo plugin_lang_get( 'attach' ) ?>" />
 		</form>
 <?php
 		}
diff --git a/Source/pages/attach.php b/Source/pages/attach.php
index b37d90181..8a1c183a7 100644
--- a/Source/pages/attach.php
+++ b/Source/pages/attach.php
@@ -8,6 +8,7 @@
 
 $f_changeset_id = gpc_get_int( 'id' );
 $f_bug_ids = gpc_get_string( 'bug_ids' );
+$f_redirect = gpc_get_string( 'redirect', '' );
 
 $t_changeset = SourceChangeset::load( $f_changeset_id );
 $t_changeset->load_bugs();
@@ -30,5 +31,16 @@
 $t_changeset->save_bugs( $t_user_id );
 
 form_security_purge( 'plugin_Source_attach' );
-print_successful_redirect( plugin_page( 'view', true ) . '&id=' . $t_changeset->id );
 
+# If a redirection id was provided, return to the corresponding anchor on
+# changeset list page, otherwise go to view page
+if( $f_redirect ) {
+	$t_redirect_url =  plugin_page( 'list', true )
+		. '&id=' . $t_changeset->repo_id
+		. '#' . string_attribute( $f_redirect );
+} else {
+	$t_redirect_url = plugin_page( 'view', true )
+		. '&id=' . $t_changeset->id;
+}
+
+print_successful_redirect( $t_redirect_url );