Menu
▾
▴
[Mantisbt-cvs] mantisbt bug_close_page.php,1.18,1.19 bug_view_advanced_page.php,1.19,1.20 bug_view_inc.php,1.4,1.5 bug_view_page.php,1.20,1.21
|
From: <jfi...@us...> - 2002-12-30 09:39:48
|
Update of /cvsroot/mantisbt/mantisbt
In directory sc8-pr-cvs1:/tmp/cvs-serv15987
Modified Files:
bug_close_page.php bug_view_advanced_page.php bug_view_inc.php
bug_view_page.php
Log Message:
yet more cleanup - all the bug_* pages are done now
Index: bug_close_page.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/bug_close_page.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- bug_close_page.php 29 Dec 2002 10:26:07 -0000 1.18
+++ bug_close_page.php 30 Dec 2002 09:39:45 -0000 1.19
@@ -48,6 +48,7 @@
</div>
<?php # Close Form END ?>
+<br />
<?php include( config_get( 'bug_view_inc' ) ) ?>
<?php print_page_bot1( __FILE__ ) ?>
Index: bug_view_advanced_page.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/bug_view_advanced_page.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- bug_view_advanced_page.php 29 Dec 2002 10:26:08 -0000 1.19
+++ bug_view_advanced_page.php 30 Dec 2002 09:39:45 -0000 1.20
@@ -34,89 +34,141 @@
<br />
<table class="width100" cellspacing="1">
+
+
<tr>
+
+ <!-- Title -->
<td class="form-title" colspan="4">
<?php echo lang_get( 'viewing_bug_advanced_details_title' ) ?>
- <span class="small"><?php print_bracket_link( '#bugnotes', lang_get( 'jump_to_bugnotes' ) ) ?></span>
-<?php if ( ( current_user_get_field( 'username' ) != config_get( 'anonymous_account' ) )
- && access_level_check_greater_or_equal( config_get( 'bug_reminder_threshold' ) ) ) { ?>
- <span class="small">
- <?php print_bracket_link( 'bug_reminder_page.php?bug_id='.$f_bug_id, lang_get( 'bug_reminder' ) ) ?>
- </span>
-<?php }?>
+
+ <!-- Jump to Bugnotes -->
+ <span class="small"><?php print_bracket_link( "#bugnotes", lang_get( 'jump_to_bugnotes' ) ) ?></span>
+
+ <!-- Send Bug Reminder -->
+ <?php
+ if ( current_user_is_anonymous() &&
+ access_level_check_greater_or_equal( config_get( 'bug_reminder_threshold' ) ) ) {
+ ?>
+ <span class="small">
+ <?php print_bracket_link( 'bug_reminder_page.php?bug_id='.$f_bug_id, lang_get( 'bug_reminder' ) ) ?>
+ </span>
+ <?php
+ }
+ ?>
+
</td>
+
+ <!-- Links -->
<td class="right" colspan="2">
-<?php if ( BOTH == config_get( 'show_view' ) ) { ?>
- <span class="small"><?php print_bracket_link( 'bug_view_page.php?bug_id=' . $f_bug_id, lang_get( 'view_simple_link' ) ) ?></span>
-<?php } ?>
+ <!-- Simple View (if enabled) -->
+ <?php if ( BOTH == config_get( 'show_view' ) ) { ?>
+ <span class="small"><?php print_bracket_link( 'bug_view_page.php?bug_id=' . $f_bug_id, lang_get( 'view_simple_link' ) ) ?></span>
+ <?php } ?>
+
+ <!-- History -->
+ <span class="small"><?php print_bracket_link( 'bug_view_page.php?bug_id=' . $f_bug_id . '&history=1#history', lang_get( 'bug_history' ) ) ?></span>
+
+ <!-- Print Bug -->
+ <span class="small"><?php print_bracket_link( 'print_bug_page.php?bug_id=' . $f_bug_id, lang_get( 'print' ) ) ?></span>
- <span class="small"><?php print_bracket_link( 'bug_view_advanced_page.php?bug_id=' . $f_bug_id . '&history=1#history', lang_get( 'bug_history' ) ) ?></span>
- <span class="small"><?php print_bracket_link( 'print_bug_page.php?bug_id=' . $f_bug_id, lang_get( 'print' ) ) ?></span>
</td>
+
</tr>
+
+
+<!-- Labels -->
<tr class="row-category">
- <td width="16%">
+ <td width="15%">
<?php echo lang_get( 'id' ) ?>
</td>
- <td width="16%">
+ <td width="20%">
<?php echo lang_get( 'category' ) ?>
</td>
- <td width="16%">
+ <td width="15%">
<?php echo lang_get( 'severity' ) ?>
</td>
- <td width="16%">
+ <td width="20%">
<?php echo lang_get( 'reproducibility' ) ?>
</td>
- <td width="16%">
+ <td width="15%">
<?php echo lang_get( 'date_submitted' ) ?>
</td>
- <td width="16%">
+ <td width="15%">
<?php echo lang_get( 'last_update' ) ?>
</td>
</tr>
+
+
<tr <?php echo helper_alternate_class() ?>>
+
+ <!-- Bug ID -->
<td>
<?php echo bug_format_id( $f_bug_id ) ?>
</td>
+
+ <!-- Category -->
<td>
<?php echo $t_bug->category ?>
</td>
+
+ <!-- Severity -->
<td>
<?php echo get_enum_element( 'severity', $t_bug->severity ) ?>
</td>
+
+ <!-- Reproducibility -->
<td>
<?php echo get_enum_element( 'reproducibility', $t_bug->reproducibility ) ?>
</td>
+
+ <!-- Date Submitted -->
<td>
<?php print_date( config_get( 'normal_date_format' ), $t_bug->date_submitted ) ?>
</td>
+
+ <!-- Date Updated -->
<td>
<?php print_date( config_get( 'normal_date_format' ), $t_bug->last_updated ) ?>
</td>
+
</tr>
-<tr>
- <td class="spacer" colspan="6">
-
- </td>
+
+
+<!-- spacer -->
+<tr height="5" class="spacer">
+ <td colspan="6"></td>
</tr>
+
+
<tr <?php echo helper_alternate_class() ?>>
+
+ <!-- Reporter -->
<td class="category">
<?php echo lang_get( 'reporter' ) ?>
</td>
<td>
<?php print_user_with_subject( $t_bug->reporter_id, $f_bug_id ) ?>
</td>
+
+ <!-- View Status -->
<td class="category">
<?php echo lang_get( 'view_status' ) ?>
</td>
<td>
<?php echo get_enum_element( 'project_view_state', $t_bug->view_state ) ?>
</td>
- <td colspan="2">
-
+
+ <!-- spacer -->
+ <td colspan="2">
+
</td>
+
</tr>
+
+
+<!-- Handler -->
<tr <?php echo helper_alternate_class() ?>>
<td class="category">
<?php echo lang_get( 'assigned_to' ) ?>
@@ -125,134 +177,143 @@
<?php print_user_with_subject( $t_bug->handler_id, $f_bug_id ) ?>
</td>
</tr>
+
+
<tr <?php echo helper_alternate_class() ?>>
+
+ <!-- Priority -->
<td class="category">
<?php echo lang_get( 'priority' ) ?>
</td>
<td>
<?php echo get_enum_element( 'priority', $t_bug->priority ) ?>
</td>
+
+ <!-- Resolution -->
<td class="category">
<?php echo lang_get( 'resolution' ) ?>
</td>
<td>
<?php echo get_enum_element( 'resolution', $t_bug->resolution ) ?>
</td>
+
+ <!-- Platform -->
<td class="category">
<?php echo lang_get( 'platform' ) ?>
</td>
<td>
<?php echo $t_bug->platform ?>
</td>
+
</tr>
+
+
<tr <?php echo helper_alternate_class() ?>>
+
+ <!-- Status -->
<td class="category">
<?php echo lang_get( 'status' ) ?>
</td>
<td bgcolor="<?php echo get_status_color( $t_bug->status ) ?>">
<?php echo get_enum_element( 'status', $t_bug->status ) ?>
</td>
+
+ <!-- Duplicate ID -->
<td class="category">
<?php echo lang_get( 'duplicate_id' ) ?>
</td>
<td>
<?php print_duplicate_id( $t_bug->duplicate_id ) ?>
</td>
+
+ <!-- Operating System -->
<td class="category">
<?php echo lang_get( 'os' ) ?>
</td>
<td>
<?php echo $t_bug->os ?>
</td>
+
</tr>
+
+
<tr <?php echo helper_alternate_class() ?>>
+
+ <!-- Projection -->
<td class="category">
<?php echo lang_get( 'projection' ) ?>
</td>
<td>
<?php echo get_enum_element( 'projection', $t_bug->projection ) ?>
</td>
- <td colspan="2">
+ <!-- spacer -->
+ <td colspan="2">
+
</td>
+
+ <!-- OS Version -->
<td class="category">
<?php echo lang_get( 'os_version' ) ?>
</td>
<td>
<?php echo $t_bug->os_build ?>
</td>
+
</tr>
+
+
<tr <?php echo helper_alternate_class() ?>>
+
+ <!-- ETA -->
<td class="category">
<?php echo lang_get( 'eta' ) ?>
</td>
<td>
<?php echo get_enum_element( 'eta', $t_bug->eta ) ?>
</td>
- <td colspan="2">
+ <!-- spacer -->
+ <td colspan="2">
+
</td>
+
+ <!-- Product Version -->
<td class="category">
<?php echo lang_get( 'product_version' ) ?>
</td>
<td>
<?php echo $t_bug->version ?>
</td>
+
</tr>
+
+
<tr <?php echo helper_alternate_class() ?>>
- <td colspan="4">
-
+
+ <!-- spacer -->
+ <td colspan="4">
+
</td>
+
+ <!-- Product Build -->
<td class="category">
<?php echo lang_get( 'product_build' ) ?>
</td>
<td>
<?php echo $t_bug->build?>
</td>
-</tr>
-<tr <?php echo helper_alternate_class() ?>>
- <td colspan="4">
-
- </td>
- <td class="category">
- <?php echo lang_get( 'votes' ) ?>
- </td>
- <td>
- <?php echo $t_bug->votes ?>
- </td>
-</tr>
-<?php if( ON == config_get( 'use_experimental_custom_fields' ) ) { ?>
-<?php
-$t_related_custom_field_ids = custom_field_get_bound_ids( helper_get_current_project() );
-foreach( $t_related_custom_field_ids as $t_id ) {
- $t_def = custom_field_get_definition($t_id);
-?>
-<tr <?php echo helper_alternate_class() ?>>
- <td class="category">
- <?php echo lang_get_defaulted( $t_def['name'] ) ?>
- </td>
- <td colspan="5">
- <?php
- $t_custom_field_value = custom_field_get_value( $t_id, $f_bug_id );
- if( CUSTOM_FIELD_TYPE_EMAIL == $t_def['type'] ) {
- echo "<a href=\"mailto:$t_custom_field_value\">$t_custom_field_value</a>";
- } else {
- echo $t_custom_field_value;
- }
- ?>
- </td>
</tr>
-<?php
-} // foreach
-?>
-<?php } // ON = config_get( 'use_experimental_custom_fields' ) ?>
-<tr>
- <td class="spacer" colspan="6">
-
- </td>
+
+<!-- spacer -->
+<tr height="5" class="spacer">
+ <td colspan="6"></td>
</tr>
+
+
+<!-- Summary -->
<tr <?php echo helper_alternate_class() ?>>
<td class="category">
<?php echo lang_get( 'summary' ) ?>
@@ -261,6 +322,9 @@
<?php echo $t_bug->summary ?>
</td>
</tr>
+
+
+<!-- Description -->
<tr <?php echo helper_alternate_class() ?>>
<td class="category">
<?php echo lang_get( 'description' ) ?>
@@ -269,6 +333,9 @@
<?php echo $t_bug->description ?>
</td>
</tr>
+
+
+<!-- Steps to Reproduce -->
<tr <?php echo helper_alternate_class() ?>>
<td class="category">
<?php echo lang_get( 'steps_to_reproduce' ) ?>
@@ -277,6 +344,9 @@
<?php echo $t_bug->steps_to_reproduce ?>
</td>
</tr>
+
+
+<!-- Additional Information -->
<tr <?php echo helper_alternate_class() ?>>
<td class="category">
<?php echo lang_get( 'additional_information' ) ?>
@@ -285,58 +355,128 @@
<?php echo $t_bug->additional_information ?>
</td>
</tr>
-<?php
-#@@@ REMOVE THIS CODE!!
- $t_user_profile_table = config_get( 'mantis_user_profile_table' );
- # account profile description
- $t_profile_id = bug_get_field( $f_bug_id, 'profile_id' );
- if ( $t_profile_id > 0 ) {
- $query = "SELECT description
- FROM $t_user_profile_table
- WHERE id='$t_profile_id'";
- $result = db_query( $query );
- $t_profile_description = '';
- if ( db_num_rows( $result ) > 0 ) {
- $t_profile_description = db_result( $result, 0 );
- }
- $t_profile_description = string_display( $t_profile_description );
+<!-- Custom Fields -->
+<?php if( ON == config_get( 'use_experimental_custom_fields' ) ) { ?>
+<!-- spacer -->
+<tr height="5" class="spacer">
+ <td colspan="6"></td>
+</tr>
+<?php
+ $t_related_custom_field_ids = custom_field_get_bound_ids( helper_get_current_project() );
+ foreach( $t_related_custom_field_ids as $t_id ) {
+ $t_def = custom_field_get_definition( $t_id );
?>
-<tr>
- <td class="spacer" colspan="6">
-
- </td>
+ <tr <?php echo helper_alternate_class() ?>>
+ <td class="category">
+ <?php echo lang_get_defaulted( $t_def['name'] ) ?>
+ </td>
+ <td colspan="5">
+ <?php
+ $t_custom_field_value = custom_field_get_value( $t_id, $f_bug_id );
+ if( CUSTOM_FIELD_TYPE_EMAIL == $t_def['type'] ) {
+ echo "<a href=\"mailto:$t_custom_field_value\">$t_custom_field_value</a>";
+ } else {
+ echo $t_custom_field_value;
+ }
+ ?>
+ </td>
+ </tr>
+<?php
+ } # foreach
+?>
+<?php } # ON = config_get( 'use_experimental_custom_fields' ) ?>
+
+
+<!-- spacer -->
+<tr height="5" class="spacer">
+ <td colspan="6"></td>
</tr>
+
+
+<!-- Attachments -->
+<?php
+ $t_show_attachments = ( $t_bug->reporter_id == auth_get_current_user_id() ) || access_level_check_greater_or_equal( config_get( 'view_attachments_threshold' ) );
+
+ if ( $t_show_attachments ) {
+?>
<tr <?php echo helper_alternate_class() ?>>
<td class="category">
- <?php echo lang_get( 'system_profile' ) ?>
+ <?php echo lang_get( 'attached_files' ) ?>
</td>
<td colspan="5">
- <?php echo $t_profile_description ?>
+ <?php file_list_attachments ( $f_bug_id ); ?>
</td>
</tr>
<?php
}
+?>
- $t_show_attachments = ( $t_bug->reporter_id == auth_get_current_user_id() ) || access_level_check_greater_or_equal( config_get( 'view_attachments_threshold' ) );
- if ( $t_show_attachments ) {
-?>
+<!-- Bug Relationships -->
<tr <?php echo helper_alternate_class() ?>>
<td class="category">
- <?php echo lang_get( 'attached_files' ) ?>
+ <?php echo lang_get( 'bug_relationships' ) ?>
</td>
<td colspan="5">
- <?php file_list_attachments ( $f_bug_id ); ?>
+ <?php
+ $result = relationship_fetch_all_src( $f_bug_id );
+ $relationship_count = db_num_rows( $result );
+ for ( $i = 0 ; $i < $relationship_count ; $i++ ) {
+ $row = db_fetch_array( $result );
+
+ $t_bug_link = string_get_bug_view_link( $row['destination_bug_id'] );
+ switch ( $row['relationship_type'] ) {
+ case BUG_DUPLICATE:
+ $t_description = str_replace( '%id', $t_bug_link, lang_get( 'duplicate_of' ) );
+ break;
+ case BUG_RELATED:
+ $t_description = str_replace( '%id', $t_bug_link, lang_get( 'related_to' ) );
+ break;
+ case BUG_DEPENDANT:
+ $t_description = str_replace( '%id', $t_bug_link, lang_get( 'dependant_on' ) );
+ break;
+ default:
+ $t_description = str_replace( '%id', $t_bug_link, lang_get( 'duplicate_of' ) );
+ }
+
+ echo $t_description . '<br />';
+ }
+ ?>
+ <?php
+ $result = relationship_fetch_all_dest( $f_bug_id );
+ $relationship_count = db_num_rows( $result );
+ for ( $i = 0 ; $i < $relationship_count ; $i++ ) {
+ $row = db_fetch_array( $result );
+
+ $t_bug_link = string_get_bug_view_link( $row['source_bug_id'] );
+ switch ( $row['relationship_type'] ) {
+ case BUG_DUPLICATE:
+ $t_description = str_replace( '%id', $t_bug_link, lang_get( 'has_duplicate' ) );
+ break;
+ case BUG_RELATED:
+ $t_description = str_replace( '%id', $t_bug_link, lang_get( 'related_to' ) );
+ break;
+ case BUG_DEPENDANT:
+ $t_description = str_replace( '%id', $t_bug_link, lang_get( 'blocks' ) );
+ break;
+ default:
+ $t_description = str_replace( '%id', $t_bug_link, lang_get( 'has_duplicate' ) );
+ }
+
+ echo $t_description . '<br />';
+ }
+ ?>
</td>
</tr>
-<?php } ?>
+
+
+<!-- Buttons -->
<tr align="center">
<td colspan="6">
<table width="100%">
<tr align="center">
-<?php # UPDATE form BEGIN ?>
<?php
# UPDATE button
if ( $t_bug->status < RESOLVED ) {
@@ -366,7 +506,7 @@
echo '</td>';
}
- # REOPEN button
+ # CLOSE button
if ( $t_bug->status == RESOLVED ) {
echo '<td class="center">';
html_button_bug_close( $f_bug_id );
@@ -396,12 +536,15 @@
</table>
<?php
+ # File upload box
if ( $t_bug->status < RESOLVED ) {
include( config_get( 'bug_file_upload_inc' ) );
}
+ # Bugnotes
include( config_get( 'bugnote_include_file' ) );
+ # History
if ( $f_history ) {
include( config_get( 'history_include_file' ) );
}
Index: bug_view_inc.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/bug_view_inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- bug_view_inc.php 29 Oct 2002 09:27:47 -0000 1.4
+++ bug_view_inc.php 30 Dec 2002 09:39:45 -0000 1.5
@@ -16,114 +16,176 @@
<?php
$t_bug = bug_prepare_display( bug_get( $f_bug_id, true ) );
?>
-<br />
+
<table class="width100" cellspacing="1">
+
+<!-- Title -->
<tr>
<td class="form-title" colspan="6">
<?php echo lang_get( 'viewing_bug_simple_details_title' ) ?>
</td>
</tr>
-<tr>
- <td class="category" width="15%">
+
+
+<!-- Labels -->
+<tr class="row-category">
+ <td width="15%">
<?php echo lang_get( 'id' ) ?>
</td>
- <td class="category" width="20%">
+ <td width="20%">
<?php echo lang_get( 'category' ) ?>
</td>
- <td class="category" width="15%">
+ <td width="15%">
<?php echo lang_get( 'severity' ) ?>
</td>
- <td class="category" width="20%">
+ <td width="20%">
<?php echo lang_get( 'reproducibility' ) ?>
</td>
- <td class="category" width="15%">
+ <td width="15%">
<?php echo lang_get( 'date_submitted' ) ?>
</td>
- <td class="category" width="15%">
+ <td width="15%">
<?php echo lang_get( 'last_update' ) ?>
</td>
</tr>
-<tr class="row-2">
+
+
+<tr <?php echo helper_alternate_class() ?>>
+
+ <!-- Bug ID -->
<td>
<?php echo bug_format_id( $f_bug_id ) ?>
</td>
+
+ <!-- Category -->
<td>
<?php echo $t_bug->category ?>
</td>
+
+ <!-- Severity -->
<td>
<?php echo get_enum_element( 'severity', $t_bug->severity ) ?>
</td>
+
+ <!-- Reproducibility -->
<td>
<?php echo get_enum_element( 'reproducibility', $t_bug->reproducibility ) ?>
</td>
+
+ <!-- Date Submitted -->
<td>
<?php print_date( config_get( 'normal_date_format' ), $t_bug->date_submitted ) ?>
</td>
+
+ <!-- Date Updated -->
<td>
<?php print_date( config_get( 'normal_date_format' ), $t_bug->last_updated ) ?>
</td>
+
</tr>
+
+
+<!-- spacer -->
<tr height="5" class="spacer">
- <td colspan="6">
-
- </td>
+ <td colspan="6"></td>
</tr>
-<tr class="row-1">
+
+
+<tr <?php echo helper_alternate_class() ?>>
+
+ <!-- Reporter -->
<td class="category">
<?php echo lang_get( 'reporter' ) ?>
</td>
- <td colspan="5">
- <?php print_user( $t_bug->reporter_id ) ?>
+ <td>
+ <?php print_user_with_subject( $t_bug->reporter_id, $f_bug_id ) ?>
+ </td>
+
+ <!-- View Status -->
+ <td class="category">
+ <?php echo lang_get( 'view_status' ) ?>
</td>
+ <td>
+ <?php echo get_enum_element( 'project_view_state', $t_bug->view_state ) ?>
+ </td>
+
+ <!-- spacer -->
+ <td colspan="2">
+
+ </td>
+
</tr>
-<tr class="row-2">
+
+
+<!-- Handler -->
+<tr <?php echo helper_alternate_class() ?>>
<td class="category">
<?php echo lang_get( 'assigned_to' ) ?>
</td>
<td colspan="5">
- <?php print_user( $t_bug->handler_id ) ?>
+ <?php print_user_with_subject( $t_bug->handler_id, $f_bug_id ) ?>
</td>
</tr>
-<tr class="row-1">
+
+<tr <?php echo helper_alternate_class() ?>>
+
+ <!-- Priority -->
<td class="category">
<?php echo lang_get( 'priority' ) ?>
</td>
<td>
<?php echo get_enum_element( 'priority', $t_bug->priority ) ?>
</td>
+
+ <!-- Resolution -->
<td class="category">
<?php echo lang_get( 'resolution' ) ?>
</td>
<td>
<?php echo get_enum_element( 'resolution', $t_bug->resolution ) ?>
</td>
+
+ <!-- spacer -->
<td colspan="2">
</td>
</tr>
-<tr class="row-2">
+
+
+<tr <?php echo helper_alternate_class() ?>>
+
+ <!-- Status -->
<td class="category">
<?php echo lang_get( 'status' ) ?>
</td>
<td bgcolor="<?php echo get_status_color( $t_bug->status ) ?>">
<?php echo get_enum_element( 'status', $t_bug->status ) ?>
</td>
+
+ <!-- Duplicate ID -->
<td class="category">
<?php echo lang_get( 'duplicate_id' ) ?>
</td>
<td>
<?php print_duplicate_id( $t_bug->duplicate_id ) ?>
</td>
+
+ <!-- spacer -->
<td colspan="2">
</td>
+
</tr>
+
+
+<!-- spacer -->
<tr height="5" class="spacer">
- <td colspan="6">
-
- </td>
+ <td colspan="6"></td>
</tr>
-<tr class="row-1">
+
+
+<!-- Summary -->
+<tr <?php echo helper_alternate_class() ?>>
<td class="category">
<?php echo lang_get( 'summary' ) ?>
</td>
@@ -131,7 +193,10 @@
<?php echo $t_bug->summary ?>
</td>
</tr>
-<tr class="row-2">
+
+
+<!-- Description -->
+<tr <?php echo helper_alternate_class() ?>>
<td class="category">
<?php echo lang_get( 'description' ) ?>
</td>
@@ -139,7 +204,10 @@
<?php echo $t_bug->description ?>
</td>
</tr>
-<tr class="row-1">
+
+
+<!-- Additional Information -->
+<tr <?php echo helper_alternate_class() ?>>
<td class="category">
<?php echo lang_get( 'additional_information' ) ?>
</td>
@@ -147,4 +215,6 @@
<?php echo $t_bug->additional_information ?>
</td>
</tr>
+
+
</table>
Index: bug_view_page.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/bug_view_page.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- bug_view_page.php 29 Dec 2002 10:26:08 -0000 1.20
+++ bug_view_page.php 30 Dec 2002 09:39:45 -0000 1.21
@@ -33,87 +33,141 @@
<br />
<table class="width100" cellspacing="1">
+
+
<tr>
+
+ <!-- Title -->
<td class="form-title" colspan="4">
<?php echo lang_get( 'viewing_bug_simple_details_title' ) ?>
+
+ <!-- Jump to Bugnotes -->
<span class="small"><?php print_bracket_link( "#bugnotes", lang_get( 'jump_to_bugnotes' ) ) ?></span>
-<?php if ( ( current_user_get_field( 'username' ) != config_get( 'anonymous_account' ) )
- && access_level_check_greater_or_equal( config_get( 'bug_reminder_threshold' ) ) ) { ?>
- <span class="small">
- <?php print_bracket_link( 'bug_reminder_page.php?bug_id='.$f_bug_id, lang_get( 'bug_reminder' ) ) ?>
- </span>
-<?php }?>
+
+ <!-- Send Bug Reminder -->
+ <?php
+ if ( current_user_is_anonymous() &&
+ access_level_check_greater_or_equal( config_get( 'bug_reminder_threshold' ) ) ) {
+ ?>
+ <span class="small">
+ <?php print_bracket_link( 'bug_reminder_page.php?bug_id='.$f_bug_id, lang_get( 'bug_reminder' ) ) ?>
+ </span>
+ <?php
+ }
+ ?>
+
</td>
+
+ <!-- Links -->
<td class="right" colspan="2">
-<?php if ( BOTH == config_get( 'show_view' ) ) { ?>
+
+ <!-- Advanced View (if enabled) -->
+ <?php if ( BOTH == config_get( 'show_view' ) ) { ?>
<span class="small"><?php print_bracket_link( 'bug_view_advanced_page.php?bug_id=' . $f_bug_id, lang_get( 'view_advanced_link' ) )?></span>
-<?php }?>
- <span class="small"><?php print_bracket_link( 'bug_view_page.php?bug_id=' . $f_bug_id . '&history=1#history', lang_get( 'bug_history' ) ) ?></span>
- <span class="small"><?php print_bracket_link( 'print_bug_page.php?bug_id=' . $f_bug_id, lang_get( 'print' ) ) ?></span>
+ <?php }?>
+
+ <!-- History -->
+ <span class="small"><?php print_bracket_link( 'bug_view_page.php?bug_id=' . $f_bug_id . '&history=1#history', lang_get( 'bug_history' ) ) ?></span>
+
+ <!-- Print Bug -->
+ <span class="small"><?php print_bracket_link( 'print_bug_page.php?bug_id=' . $f_bug_id, lang_get( 'print' ) ) ?></span>
+
</td>
+
</tr>
+
+
+<!-- Labels -->
<tr class="row-category">
- <td width="16%">
+ <td width="15%">
<?php echo lang_get( 'id' ) ?>
</td>
- <td width="16%">
+ <td width="20%">
<?php echo lang_get( 'category' ) ?>
</td>
- <td width="16%">
+ <td width="15%">
<?php echo lang_get( 'severity' ) ?>
</td>
- <td width="16%">
+ <td width="20%">
<?php echo lang_get( 'reproducibility' ) ?>
</td>
- <td width="16%">
+ <td width="15%">
<?php echo lang_get( 'date_submitted' ) ?>
</td>
- <td width="16%">
+ <td width="15%">
<?php echo lang_get( 'last_update' ) ?>
</td>
</tr>
+
+
<tr <?php echo helper_alternate_class() ?>>
+
+ <!-- Bug ID -->
<td>
<?php echo bug_format_id( $f_bug_id ) ?>
</td>
+
+ <!-- Category -->
<td>
<?php echo $t_bug->category ?>
</td>
+
+ <!-- Severity -->
<td>
<?php echo get_enum_element( 'severity', $t_bug->severity ) ?>
</td>
+
+ <!-- Reproducibility -->
<td>
<?php echo get_enum_element( 'reproducibility', $t_bug->reproducibility ) ?>
</td>
+
+ <!-- Date Submitted -->
<td>
<?php print_date( config_get( 'normal_date_format' ), $t_bug->date_submitted ) ?>
</td>
+
+ <!-- Date Updated -->
<td>
<?php print_date( config_get( 'normal_date_format' ), $t_bug->last_updated ) ?>
</td>
+
</tr>
-<tr>
- <td class="spacer" colspan="6">
-
- </td>
+
+
+<!-- spacer -->
+<tr height="5" class="spacer">
+ <td colspan="6"></td>
</tr>
+
+
<tr <?php echo helper_alternate_class() ?>>
+
+ <!-- Reporter -->
<td class="category">
<?php echo lang_get( 'reporter' ) ?>
</td>
<td>
<?php print_user_with_subject( $t_bug->reporter_id, $f_bug_id ) ?>
</td>
+
+ <!-- View Status -->
<td class="category">
<?php echo lang_get( 'view_status' ) ?>
</td>
<td>
<?php echo get_enum_element( 'project_view_state', $t_bug->view_state ) ?>
</td>
- <td colspan="2">
-
+
+ <!-- spacer -->
+ <td colspan="2">
+
</td>
+
</tr>
+
+
+<!-- Handler -->
<tr <?php echo helper_alternate_class() ?>>
<td class="category">
<?php echo lang_get( 'assigned_to' ) ?>
@@ -122,74 +176,66 @@
<?php print_user_with_subject( $t_bug->handler_id, $f_bug_id ) ?>
</td>
</tr>
+
+
<tr <?php echo helper_alternate_class() ?>>
+
+ <!-- Priority -->
<td class="category">
<?php echo lang_get( 'priority' ) ?>
</td>
<td>
<?php echo get_enum_element( 'priority', $t_bug->priority ) ?>
</td>
+
+ <!-- Resolution -->
<td class="category">
<?php echo lang_get( 'resolution' ) ?>
</td>
<td>
<?php echo get_enum_element( 'resolution', $t_bug->resolution ) ?>
</td>
- <td colspan="2">
-
+
+ <!-- spacer -->
+ <td colspan="2">
+
</td>
</tr>
+
+
<tr <?php echo helper_alternate_class() ?>>
+
+ <!-- Status -->
<td class="category">
<?php echo lang_get( 'status' ) ?>
</td>
<td bgcolor="<?php echo get_status_color( $t_bug->status ) ?>">
<?php echo get_enum_element( 'status', $t_bug->status ) ?>
</td>
+
+ <!-- Duplicate ID -->
<td class="category">
<?php echo lang_get( 'duplicate_id' ) ?>
</td>
<td>
<?php print_duplicate_id( $t_bug->duplicate_id ) ?>
</td>
- <td colspan="2">
-
- </td>
-</tr>
-<?php if( ON == config_get( 'use_experimental_custom_fields' ) ) { ?>
-<?php
-$t_related_custom_field_ids = custom_field_get_bound_ids( helper_get_current_project() );
-foreach( $t_related_custom_field_ids as $t_id ) {
- $t_def = custom_field_get_definition($t_id);
- if( !$t_def['advanced'] ) {
-?>
-<tr <?php echo helper_alternate_class() ?>>
- <td class="category">
- <?php echo lang_get_defaulted( $t_def['name'] ) ?>
- </td>
- <td colspan="5">
- <?php
- $t_custom_field_value = custom_field_get_value( $t_id, $f_bug_id );
- if( CUSTOM_FIELD_TYPE_EMAIL == $t_def['type'] ) {
- echo "<a href=\"mailto:$t_custom_field_value\">$t_custom_field_value</a>";
- } else {
- echo $t_custom_field_value;
- }
- ?>
+ <!-- spacer -->
+ <td colspan="2">
+
</td>
+
</tr>
-<?php
- } // !$t_def['advanced']
-} // foreach
-?>
-<?php } // ON = config_get( 'use_experimental_custom_fields' ) ?>
-<tr>
- <td class="spacer" colspan="6">
-
- </td>
+
+<!-- spacer -->
+<tr height="5" class="spacer">
+ <td colspan="6"></td>
</tr>
+
+
+<!-- Summary -->
<tr <?php echo helper_alternate_class() ?>>
<td class="category">
<?php echo lang_get( 'summary' ) ?>
@@ -198,6 +244,9 @@
<?php echo $t_bug->summary ?>
</td>
</tr>
+
+
+<!-- Description -->
<tr <?php echo helper_alternate_class() ?>>
<td class="category">
<?php echo lang_get( 'description' ) ?>
@@ -206,6 +255,9 @@
<?php echo $t_bug->description ?>
</td>
</tr>
+
+
+<!-- Additional Information -->
<tr <?php echo helper_alternate_class() ?>>
<td class="category">
<?php echo lang_get( 'additional_information' ) ?>
@@ -214,6 +266,49 @@
<?php echo $t_bug->additional_information ?>
</td>
</tr>
+
+
+<!-- Custom Fields -->
+<?php if( ON == config_get( 'use_experimental_custom_fields' ) ) { ?>
+<!-- spacer -->
+<tr height="5" class="spacer">
+ <td colspan="6"></td>
+</tr>
+<?php
+ $t_related_custom_field_ids = custom_field_get_bound_ids( helper_get_current_project() );
+ foreach( $t_related_custom_field_ids as $t_id ) {
+ $t_def = custom_field_get_definition( $t_id );
+ if( !$t_def['advanced'] ) {
+?>
+ <tr <?php echo helper_alternate_class() ?>>
+ <td class="category">
+ <?php echo lang_get_defaulted( $t_def['name'] ) ?>
+ </td>
+ <td colspan="5">
+ <?php
+ $t_custom_field_value = custom_field_get_value( $t_id, $f_bug_id );
+ if( CUSTOM_FIELD_TYPE_EMAIL == $t_def['type'] ) {
+ echo "<a href=\"mailto:$t_custom_field_value\">$t_custom_field_value</a>";
+ } else {
+ echo $t_custom_field_value;
+ }
+ ?>
+ </td>
+ </tr>
+<?php
+ } # !$t_def['advanced']
+ } # foreach
+?>
+<?php } # ON = config_get( 'use_experimental_custom_fields' ) ?>
+
+
+<!-- spacer -->
+<tr height="5" class="spacer">
+ <td colspan="6"></td>
+</tr>
+
+
+<!-- Attachments -->
<?php
$t_show_attachments = ( $t_bug->reporter_id == auth_get_current_user_id() ) || access_level_check_greater_or_equal( config_get( 'view_attachments_threshold' ) );
@@ -227,7 +322,12 @@
<?php file_list_attachments ( $f_bug_id ); ?>
</td>
</tr>
-<?php } ?>
+<?php
+ }
+?>
+
+
+<!-- Bug Relationships -->
<tr <?php echo helper_alternate_class() ?>>
<td class="category">
<?php echo lang_get( 'bug_relationships' ) ?>
@@ -236,47 +336,56 @@
<?php
$result = relationship_fetch_all_src( $f_bug_id );
$relationship_count = db_num_rows( $result );
- for ($i=0;$i<$relationship_count;$i++) {
+ for ( $i = 0 ; $i < $relationship_count ; $i++ ) {
$row = db_fetch_array( $result );
- extract( $row, EXTR_PREFIX_ALL, 'v2' );
- $t_bug_link = string_get_bug_view_link( $t_bug->destination_bug_id );
- switch ( $t_bug->relationship_type ) {
- case BUG_DUPLICATE: $t_description = str_replace( '%id', $t_bug_link, lang_get( 'duplicate_of' ) );
- break;
- case BUG_RELATED: $t_description = str_replace( '%id', $t_bug_link, lang_get( 'related_to' ) );
- break;
- case BUG_DEPENDANT: $t_description = str_replace( '%id', $t_bug_link, lang_get( 'dependant_on' ) );
- break;
- default: $t_description = str_replace( '%id', $t_bug_link, lang_get( 'duplicate_of' ) );
+ $t_bug_link = string_get_bug_view_link( $row['destination_bug_id'] );
+ switch ( $row['relationship_type'] ) {
+ case BUG_DUPLICATE:
+ $t_description = str_replace( '%id', $t_bug_link, lang_get( 'duplicate_of' ) );
+ break;
+ case BUG_RELATED:
+ $t_description = str_replace( '%id', $t_bug_link, lang_get( 'related_to' ) );
+ break;
+ case BUG_DEPENDANT:
+ $t_description = str_replace( '%id', $t_bug_link, lang_get( 'dependant_on' ) );
+ break;
+ default:
+ $t_description = str_replace( '%id', $t_bug_link, lang_get( 'duplicate_of' ) );
}
- PRINT "$t_description<br />";
+ echo $t_description . '<br />';
}
?>
<?php
$result = relationship_fetch_all_dest( $f_bug_id );
$relationship_count = db_num_rows( $result );
- for ($i=0;$i<$relationship_count;$i++) {
+ for ( $i = 0 ; $i < $relationship_count ; $i++ ) {
$row = db_fetch_array( $result );
- extract( $row, EXTR_PREFIX_ALL, 'v2' );
- $t_bug_link = string_get_bug_view_link( $t_bug->source_bug_id );
- switch ( $t_bug->relationship_type ) {
- case BUG_DUPLICATE: $t_description = str_replace( '%id', $t_bug_link, lang_get( 'has_duplicate' ) );
- break;
- case BUG_RELATED: $t_description = str_replace( '%id', $t_bug_link, lang_get( 'related_to' ) );
- break;
- case BUG_DEPENDANT: $t_description = str_replace( '%id', $t_bug_link, lang_get( 'blocks' ) );
- break;
- default: $t_description = str_replace( '%id', $t_bug_link, lang_get( 'has_duplicate' ) );
+ $t_bug_link = string_get_bug_view_link( $row['source_bug_id'] );
+ switch ( $row['relationship_type'] ) {
+ case BUG_DUPLICATE:
+ $t_description = str_replace( '%id', $t_bug_link, lang_get( 'has_duplicate' ) );
+ break;
+ case BUG_RELATED:
+ $t_description = str_replace( '%id', $t_bug_link, lang_get( 'related_to' ) );
+ break;
+ case BUG_DEPENDANT:
+ $t_description = str_replace( '%id', $t_bug_link, lang_get( 'blocks' ) );
+ break;
+ default:
+ $t_description = str_replace( '%id', $t_bug_link, lang_get( 'has_duplicate' ) );
}
- PRINT "$t_description<br />";
+ echo $t_description . '<br />';
}
?>
</td>
</tr>
+
+
+<!-- Buttons -->
<tr align="center">
<td colspan="6">
<table width="100%">
@@ -310,7 +419,7 @@
echo '</td>';
}
- # REOPEN button
+ # CLOSE button
if ( $t_bug->status == RESOLVED ) {
echo '<td class="center">';
html_button_bug_close( $f_bug_id );
@@ -337,15 +446,20 @@
</table>
</td>
</tr>
+
+
</table>
<?php
+ # File upload box
if ( $t_bug->status < RESOLVED ) {
include( config_get( 'bug_file_upload_inc' ) );
}
+ # Bugnotes
include( config_get( 'bugnote_include_file' ) );
+ # History
if ( $f_history ) {
include( config_get( 'history_include_file' ) );
}
|