Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mantisbt/mantisbt
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 471de50
Choose a base ref
...
head repository: mantisbt/mantisbt
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3caa62b
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Sep 22, 2011

  1. Removed trailing whitespace

    @dregad
    dregad committed Sep 22, 2011
    Copy the full SHA
    7ad3e7e View commit details

  2. Print Handler for Categories in a standard way 

    The user assigned to a Global or Project-specific Category as default
handler was printed in a non-standard way. We now use function
prepare_user_name() to display it instead.

Fixes #13344
    @dregad
    dregad committed Sep 22, 2011
    Copy the full SHA
    3caa62b View commit details
Showing with 15 additions and 33 deletions.
  1. +6 −17 manage_proj_edit_page.php
  2. +9 −16 manage_proj_page.php
23 changes: 6 additions & 17 deletions manage_proj_edit_page.php
View file
Original file line number Diff line number Diff line change
@@ -179,7 +179,7 @@
<!-- Title -->
<tr>
<td class="form-title" colspan="6">
<?php
<?php
echo lang_get( 'subprojects' );

# Check the user's global access level before allowing project creation
@@ -337,26 +337,15 @@
foreach ( $t_categories as $t_category ) {
$t_id = $t_category['id'];

if ( $t_category['project_id'] != $f_project_id ) {
$t_inherited = true;
} else {
$t_inherited = false;
}

$t_name = $t_category['name'];
if ( NO_USER != $t_category['user_id'] && user_exists( $t_category['user_id'] )) {
$t_user_name = user_get_name( $t_category['user_id'] );
} else {
$t_user_name = '';
}
$t_inherited = ( $t_category['project_id'] != $f_project_id );
?>
<!-- Repeated Info Row -->
<tr <?php echo helper_alternate_class() ?>>
<td>
<?php echo string_display( category_full_name( $t_category['id'] , /* showProject */ $t_inherited, $f_project_id ) ) ?>
<?php echo string_display( category_full_name( $t_id , /* showProject */ $t_inherited, $f_project_id ) ) ?>
</td>
<td>
<?php echo string_display_line( $t_user_name ) ?>
<?php echo prepare_user_name( $t_category['user_id'] ) ?>
</td>
<td class="center">
<?php if ( !$t_inherited ) {
@@ -455,7 +444,7 @@
$t_released = $t_version['released'];
$t_obsolete = $t_version['obsolete'];
if( !date_is_null( $t_version['date_order'] ) ) {
$t_date_formatted = date( config_get( 'complete_date_format' ), $t_version['date_order'] );
$t_date_formatted = date( config_get( 'complete_date_format' ), $t_version['date_order'] );
} else {
$t_date_formatted = ' ';
}
@@ -630,7 +619,7 @@
<?php
}

event_signal( 'EVENT_MANAGE_PROJECT_PAGE', array( $f_project_id ) );
event_signal( 'EVENT_MANAGE_PROJECT_PAGE', array( $f_project_id ) );
?>

<!-- PROJECT VIEW STATUS -->
25 changes: 9 additions & 16 deletions manage_proj_page.php
View file
Original file line number Diff line number Diff line change
@@ -42,13 +42,13 @@

print_manage_menu( 'manage_proj_page.php' );

# Project Menu Form BEGIN
# Project Menu Form BEGIN
?>
<br />
<table class="width100" cellspacing="1">
<tr>
<td class="form-title" colspan="5">
<?php
<?php
echo lang_get( 'projects_title' );

# Check the user's global access level before allowing project creation
@@ -60,31 +60,31 @@
</tr>
<tr class="row-category">
<td width="20%">
<?php
<?php
print_manage_project_sort_link( 'manage_proj_page.php', lang_get( 'name' ), 'name', $t_direction, $f_sort );
print_sort_icon( $t_direction, $f_sort, 'name' );
?>
</td>
<td width="10%">
<?php
<?php
print_manage_project_sort_link( 'manage_proj_page.php', lang_get( 'status' ), 'status', $t_direction, $f_sort );
print_sort_icon( $t_direction, $f_sort, 'status' );
?>
</td>
<td width="10%">
<?php
<?php
print_manage_project_sort_link( 'manage_proj_page.php', lang_get( 'enabled' ), 'enabled', $t_direction, $f_sort );
print_sort_icon( $t_direction, $f_sort, 'enabled' );
?>
</td>
<td width="10%">
<?php
<?php
print_manage_project_sort_link( 'manage_proj_page.php', lang_get( 'view_status' ), 'view_state', $t_direction, $f_sort );
print_sort_icon( $t_direction, $f_sort, 'view_state' );
?>
</td>
<td width="40%">
<?php
<?php
print_manage_project_sort_link( 'manage_proj_page.php', lang_get( 'description' ), 'description', $t_direction, $f_sort );
print_sort_icon( $t_direction, $f_sort, 'description' );
?>
@@ -185,21 +185,14 @@

foreach ( $t_categories as $t_category ) {
$t_id = $t_category['id'];

$t_name = $t_category['name'];
if ( NO_USER != $t_category['user_id'] && user_exists( $t_category['user_id'] )) {
$t_user_name = user_get_name( $t_category['user_id'] );
} else {
$t_user_name = '';
}
?>
<!-- Repeated Info Row -->
<tr <?php echo helper_alternate_class() ?>>
<td>
<?php echo string_display( category_full_name( $t_category['id'], false ) ) ?>
<?php echo string_display( category_full_name( $t_id, false ) ) ?>
</td>
<td>
<?php echo string_display_line( $t_user_name ) ?>
<?php echo prepare_user_name( $t_category['user_id'] ) ?>
</td>
<td class="center">
<?php