Skip to content

Improved handling of changesets on list page #224

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 26, 2017
Merged

Improved handling of changesets on list page #224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bddf65c
Display related issues on changesets list page
dregad Jun 9, 2017
3433e49
Allow attaching issues from changeset list page
dregad Jun 9, 2017
875c092
Redirect back to list page after linking issues
dregad Jun 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 32 additions & 3 deletions Source/Source.ViewAPI.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
Expand All @@ -35,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 )
Expand Down Expand Up @@ -63,7 +65,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.
Expand All @@ -75,13 +77,40 @@ 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>
<?php
# Build list of related issues with link
$t_bugs = array_map( 'string_get_bug_view_link', $t_changeset->bugs );

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 ?>"/>
<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' ) ?>" />
</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 ?>">
Expand Down
14 changes: 13 additions & 1 deletion Source/pages/attach.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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 );