Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
More fixes of custom enum types across projects
Fixes #13728
  • Loading branch information
dregad committed Feb 28, 2012
1 parent c077ca6 commit a2066d2
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions account_sponsor_page.php
Expand Up @@ -165,7 +165,7 @@

# describe bug
$t_status = string_attribute( get_enum_element( 'status', $t_bug->status, auth_get_current_user_id(), $t_bug->project_id ) );
$t_resolution = string_attribute( get_enum_element( 'resolution', $t_bug->resolution ) );
$t_resolution = string_attribute( get_enum_element( 'resolution', $t_bug->resolution, auth_get_current_user_id(), $t_bug->project_id ) );
$t_version_id = version_get_id( $t_bug->fixed_in_version, $t_project );
if ( ( false !== $t_version_id ) && ( VERSION_RELEASED == version_get_field( $t_version_id, 'released' ) ) ) {
$t_released_label = '<a title="' . lang_get( 'released' ) . '">' . $t_bug->fixed_in_version . '</a>';
Expand Down Expand Up @@ -278,7 +278,7 @@

# describe bug
$t_status = string_attribute( get_enum_element( 'status', $t_bug->status, auth_get_current_user_id(), $t_bug->project_id ) );
$t_resolution = string_attribute( get_enum_element( 'resolution', $t_bug->resolution ) );
$t_resolution = string_attribute( get_enum_element( 'resolution', $t_bug->resolution, auth_get_current_user_id(), $t_bug->project_id ) );
$t_version_id = version_get_id( $t_bug->fixed_in_version, $t_project );
if ( ( false !== $t_version_id ) && ( VERSION_RELEASED == version_get_field( $t_version_id, 'released' ) ) ) {
$t_released_label = '<a title="' . lang_get( 'released' ) . '">' . $t_bug->fixed_in_version . '</a>';
Expand Down
6 changes: 3 additions & 3 deletions core/columns_api.php
Expand Up @@ -1139,7 +1139,7 @@ function print_column_severity( $p_bug, $p_columns_target = COLUMNS_TARGET_VIEW_
* @access public
*/
function print_column_eta( $p_bug, $p_columns_target = COLUMNS_TARGET_VIEW_PAGE ) {
echo '<td class="center column-eta">', get_enum_element( 'eta', $p_bug->eta ), '</td>';
echo '<td class="center column-eta">', get_enum_element( 'eta', $p_bug->eta, auth_get_current_user_id(), $p_bug->project_id ), '</td>';
}

/**
Expand All @@ -1150,7 +1150,7 @@ function print_column_eta( $p_bug, $p_columns_target = COLUMNS_TARGET_VIEW_PAGE
* @access public
*/
function print_column_projection( $p_bug, $p_columns_target = COLUMNS_TARGET_VIEW_PAGE ) {
echo '<td class="center column-projection">', get_enum_element( 'projection', $p_bug->projection ), '</td>';
echo '<td class="center column-projection">', get_enum_element( 'projection', $p_bug->projection, auth_get_current_user_id(), $p_bug->project_id ), '</td>';
}

/**
Expand All @@ -1161,7 +1161,7 @@ function print_column_projection( $p_bug, $p_columns_target = COLUMNS_TARGET_VIE
* @access public
*/
function print_column_reproducibility( $p_bug, $p_columns_target = COLUMNS_TARGET_VIEW_PAGE ) {
echo '<td class="center column-reproducibility">', get_enum_element( 'reproducibility', $p_bug->reproducibility ), '</td>';
echo '<td class="center column-reproducibility">', get_enum_element( 'reproducibility', $p_bug->reproducibility, auth_get_current_user_id(), $p_bug->project_id ), '</td>';
}

/**
Expand Down
2 changes: 1 addition & 1 deletion core/relationship_api.php
Expand Up @@ -655,7 +655,7 @@ function relationship_get_details( $p_bug_id, $p_relationship, $p_html = false,
# get the information from the related bug and prepare the link
$t_bug = bug_get( $t_related_bug_id, false );
$t_status_string = get_enum_element( 'status', $t_bug->status, auth_get_current_user_id(), $t_bug->project_id );
$t_resolution_string = get_enum_element( 'resolution', $t_bug->resolution );
$t_resolution_string = get_enum_element( 'resolution', $t_bug->resolution, auth_get_current_user_id(), $t_bug->project_id );

$t_relationship_info_html = $t_td . string_no_break( $t_relationship_descr ) . '&#160;</td>';
if( $p_html_preview == false ) {
Expand Down

0 comments on commit a2066d2

Please sign in to comment.