Skip to content

Commit

Permalink
Fix filter links on Change Log and Roadmap page
Browse files Browse the repository at this point in the history
Fixes #23311

Minor PHPDoc correction
  • Loading branch information
atrol committed Sep 6, 2017
1 parent 0aee831 commit 46aae5e
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 6 deletions.
10 changes: 7 additions & 3 deletions changelog_page.php
Expand Up @@ -116,7 +116,9 @@ function print_version_header( $p_version_id ) {
echo '<div class="pull-left"><i class="fa fa-calendar-o fa-lg"> </i> ' . $t_release_date . '</div>';
echo '<div class="btn-toolbar pull-right">';
echo '<a class="btn btn-xs btn-primary btn-white btn-round" ';
echo 'href="view_all_set.php?type=1&temporary=y&' . FILTER_PROPERTY_PROJECT_ID . '=' . $t_project_id . '&' . filter_encode_field_and_value( FILTER_PROPERTY_FIXED_IN_VERSION, $t_version_name ) . '">';
echo 'href="view_all_set.php?type=1&temporary=y&' . FILTER_PROPERTY_PROJECT_ID . '=' . $t_project_id .
'&' . filter_encode_field_and_value( FILTER_PROPERTY_FIXED_IN_VERSION, $t_version_name ) .
'&' . FILTER_PROPERTY_HIDE_STATUS . '=' . META_FILTER_NONE . '">';
echo lang_get( 'view_bugs_link' );
echo '<a class="btn btn-xs btn-primary btn-white btn-round" href="changelog_page.php?version_id=' . $p_version_id . '">' . string_display_line( $t_version_name ) . '</a>';
echo '<a class="btn btn-xs btn-primary btn-white btn-round" href="changelog_page.php?project_id=' . $t_project_id . '">' . string_display_line( $t_project_name ) . '</a>';
Expand All @@ -131,7 +133,7 @@ function print_version_header( $p_version_id ) {
* Print footer for the specified project version.
* @param int $p_version_id a valid version id
* @param int $p_issues_resolved number of issues in resolved state
* @return null
* @return void
*/
function print_version_footer( $p_version_id, $p_issues_resolved ) {
$t_project_id = version_get_field( $p_version_id, 'project_id' );
Expand All @@ -142,7 +144,9 @@ function print_version_footer( $p_version_id, $p_issues_resolved ) {
echo '<div class="widget-toolbox padding-8 clearfix">';
echo ' ' . $p_issues_resolved . ' ' . lang_get( $t_bug_string ) . ' ';
echo '<a class="btn btn-xs btn-primary btn-white btn-round" ';
echo 'href="view_all_set.php?type=1&temporary=y&' . FILTER_PROPERTY_PROJECT_ID . '=' . $t_project_id . '&' . filter_encode_field_and_value( FILTER_PROPERTY_FIXED_IN_VERSION, $t_version_name ) . '">';
echo 'href="view_all_set.php?type=1&temporary=y&' . FILTER_PROPERTY_PROJECT_ID . '=' . $t_project_id .
'&' . filter_encode_field_and_value( FILTER_PROPERTY_FIXED_IN_VERSION, $t_version_name ) .
'&' . FILTER_PROPERTY_HIDE_STATUS . '=' . META_FILTER_NONE . '">';
echo lang_get( 'view_bugs_link' );
echo '</a>';
echo '</div></div></div>';
Expand Down
10 changes: 7 additions & 3 deletions roadmap_page.php
Expand Up @@ -113,7 +113,9 @@ function print_version_header( array $p_version_row ) {
}
echo '<div class="btn-toolbar pull-right">';
echo '<a class="btn btn-xs btn-primary btn-white btn-round" ';
echo 'href="view_all_set.php?type=1&temporary=y&' . FILTER_PROPERTY_PROJECT_ID . '=' . $t_project_id . '&' . filter_encode_field_and_value( FILTER_PROPERTY_TARGET_VERSION, $t_version_name ) . '">';
echo 'href="view_all_set.php?type=1&temporary=y&' . FILTER_PROPERTY_PROJECT_ID . '=' . $t_project_id .
'&' . filter_encode_field_and_value( FILTER_PROPERTY_TARGET_VERSION, $t_version_name ) .
'&' . FILTER_PROPERTY_HIDE_STATUS . '=' . META_FILTER_NONE . '">';
echo lang_get( 'view_bugs_link' );
echo '<a class="btn btn-xs btn-primary btn-white btn-round" href="roadmap_page.php?version_id=' . $t_version_id . '">' . string_display_line( $t_version_name ) . '</a>';
echo '<a class="btn btn-xs btn-primary btn-white btn-round" href="roadmap_page.php?project_id=' . $t_project_id . '">' . string_display_line( $t_project_name ) . '</a>';
Expand All @@ -130,7 +132,7 @@ function print_version_header( array $p_version_row ) {
* @param int $p_issues_resolved number of issues in resolved state
* @param int $p_issues_planned number of issues planned for this version
* @param int $p_progress percentage progress
* @return null
* @return void
*/
function print_version_footer( $p_version_row, $p_issues_resolved, $p_issues_planned, $p_progress ) {
$t_project_id = $p_version_row['project_id'];
Expand All @@ -143,7 +145,9 @@ function print_version_footer( $p_version_row, $p_issues_resolved, $p_issues_pla
echo '<div class="widget-toolbox padding-8 clearfix">';
echo sprintf( lang_get( 'resolved_progress' ), $p_issues_resolved, $p_issues_planned, $p_progress );
echo ' <a class="btn btn-xs btn-primary btn-white btn-round" ';
echo 'href="view_all_set.php?type=1&temporary=y&' . FILTER_PROPERTY_PROJECT_ID . '=' . $t_project_id . '&' . filter_encode_field_and_value( FILTER_PROPERTY_TARGET_VERSION, $t_version_name ) . '">';
echo 'href="view_all_set.php?type=1&temporary=y&' . FILTER_PROPERTY_PROJECT_ID . '=' . $t_project_id .
'&' . filter_encode_field_and_value( FILTER_PROPERTY_TARGET_VERSION, $t_version_name ) .
'&' . FILTER_PROPERTY_HIDE_STATUS . '=' . META_FILTER_NONE . '">';
echo lang_get( 'view_bugs_link' );
echo '</a>';
echo '</div>';
Expand Down

0 comments on commit 46aae5e

Please sign in to comment.