>
-
- | |
-
-
+
+
- |
-
-
-
+ |
+
+
@@ -98,24 +97,7 @@
- |
-
-
-
-
-
- |
-
-
-
@@ -129,13 +111,12 @@
-
+*/ ?>
|
-
-
+
>
-
+ |
+
+ |
-
+ |
|
-
+
+
+ |
-
+ |
project_id, 'name' ) );
echo "[$t_project_name] $t_bug->category";
?>
|
+
+
+ |
-
+ |
severity ) ?>
|
+
+
+>
+
+ |
+
+ |
reproducibility ) ?>
|
+
+
+ |
date_submitted ) ?>
|
+
+
+ |
+
@@ -198,7 +200,7 @@
|
- |
+ |
@@ -212,59 +214,24 @@
reporter_id, $f_bug_id ) ?>
-
-
-
- |
-
- view_state ) ?>
- |
-
-
- |
-
-
-
-
-
->
+
|
|
-
+ |
handler_id, $f_bug_id );
}
?>
|
-
-
-
->
-
-
- |
-
- |
-
- priority ) ?>
- |
-
-
-
-
- |
-
- resolution ) ?>
- |
-
+
-
+
|
- platform ?>
+ view_state ) ?>
|
@@ -272,59 +239,28 @@
>
-
- |
-
- |
-
- status ) ?>
- |
-
- ', lang_get( 'duplicate_id' ), ' ';
- echo '';
- print_duplicate_id( $t_bug->duplicate_id );
- echo ' | ';
- } else {
- # spacer
- echo ' | ';
- }
- ?>
-
-
+
-
+
|
- os ?>
+ priority ) ?>
|
-
-
-
->
-
-
+
|
-
+
|
- projection ) ?>
+ status ) ?>
|
-
- |
-
-
+
-
+
|
- os_build ?>
+ resolution ) ?>
|
@@ -332,12 +268,12 @@
>
-
+
|
-
+
|
- eta ) ?>
+ platform ?>
|
@@ -363,54 +299,42 @@
-
+
+
+
-
+
|
- version ?>
+ target_version ?>
|
-
-
- |
-
- build ?>
- |
+
+ |
+ >
-
-
+
->
-
-
-
- | |
-
-
-
+
|
- target_version ?>
+ version ?>
|
-
- |
+ |
@@ -419,18 +343,15 @@
|
-
+ |
build?>
|
-
- |
+ |
@@ -450,12 +371,36 @@
|
-
- description ?>
+ | summary)) {
+ echo ' class="buildfailure"';
+ }
+
+ ?>>
+ description) as $line) {
+ if (preg_match('/^(com\.dmdirc\..*)(\..*?)\((.*?:([0-9]+))\)(.*?)$/', $line, $m)) {
+ $link = 'http://fisheye.dmdirc.com/browse/DMDIrc/trunk/src/';
+ $link .= str_replace('.', '/', $m[1]) . '.java';
+
+ if (preg_match('/\(([0-9]{3,6})\)/', $t_bug->build, $b)) {
+ $link .= '?r=' . $b[1];
+ } else {
+ $link .= '?r=999999';
+ }
+
+ $link .= '#l' . $m[4];
+ $line = $m[1] . $m[2] . '(' . $m[3] . ')' . $m[5];
+ }
+ echo $line;
+ }
+ ?>
|
+steps_to_reproduce)) { ?>
>
|
@@ -465,8 +410,9 @@
steps_to_reproduce ?>
|
+
-
+additional_information)) { ?>
>
|
@@ -476,6 +422,7 @@
additional_information ?>
|
+
@@ -501,10 +448,11 @@
-
+
reporter_id == auth_get_current_user_id() ) || access_has_bug_level( config_get( 'view_attachments_threshold' ), $f_bug_id );
- if ( $t_show_attachments ) {
+ if ( $t_show_attachments && file_bug_attachment_count($f_bug_id) > 0 ) {
?>
>
|
@@ -559,7 +507,7 @@
|
- |
+ |
@@ -568,6 +516,8 @@
|
diff -Pur mantis-1.1.2/core/bug_api.php bugs-test/core/bug_api.php
--- mantis-1.1.2/core/bug_api.php 2008-05-30 17:02:29.000000000 +0100
+++ bugs-test/core/bug_api.php 2008-07-03 19:20:51.000000000 +0100
@@ -340,6 +340,8 @@
# Creation / Deletion / Updating
#===================================
+ require_once('/home/dmdirc/post-commit/oblong.php');
+
# --------------------
# Create a new bug and return the bug id
#
@@ -391,6 +393,13 @@
$c_target_version = '';
}
+ # Auto-set the target version
+ if (is_blank($c_target_version)) {
+ $sql = 'SELECT version FROM mantis_project_version_table WHERE released = 0 ORDER BY date_order LIMIT 0,1';
+ $res = db_query($sql);
+ $c_target_version = db_result($res);
+ }
+
$t_bug_table = config_get( 'mantis_bug_table' );
$t_bug_text_table = config_get( 'mantis_bug_text_table' );
$t_project_category_table = config_get( 'mantis_project_category_table' );
@@ -468,6 +477,10 @@
$t_bug_id = db_insert_id($t_bug_table);
+ $uname = user_get_field( $c_reporter_id, 'username' );
+ Oblong("Bug $t_bug_id [http://bugs.dmdirc.com/view.php?id=$t_bug_id] created by $uname: " . $p_bug_data->summary);
+
+
# log new bug
history_log_event_special( $t_bug_id, NEW_BUG );
@@ -925,6 +938,24 @@
email_generic( $p_bug_id, 'updated', $t_action_prefix . 'updated' );
}
+ # Auto-assign based on category changes -- MD87, 03/01/08
+ if ($p_bug_data->category != $t_old_data->category &&
+ $p_bug_data->handler_id == 0 && $t_old_data->handler_id == 0) {
+
+ $t_project_category_table = config_get( 'mantis_project_category_table' );
+
+ $query = "SELECT user_id
+ FROM $t_project_category_table
+ WHERE project_id='" . $c_bug_data->project_id . "' AND category='" . $c_bug_data->category . "'";
+ $result = db_query( $query );
+
+ if ( db_num_rows( $result ) > 0 ) {
+ bug_assign($p_bug_id, db_result($result));
+ }
+
+ }
+
+
return true;
}
@@ -1161,6 +1192,28 @@
bug_clear_cache( $p_bug_id );
+ # If they're changing the category, poke auto-assigns -- MD87, 03/01/08
+ if ($p_field_name == 'category') {
+ $t_project_category_table = config_get( 'mantis_project_category_table' );
+
+ $handler = bug_get_field($p_bug_id, 'handler_id');
+ $project = bug_get_field($p_bug_id, 'project_id');
+
+ if ($handler == 0) {
+ # It's not already assigned
+
+ $query = "SELECT user_id
+ FROM $t_project_category_table
+ WHERE project_id='$project' AND category=$c_status";
+ $result = db_query( $query );
+
+ if ( db_num_rows( $result ) > 0 ) {
+ bug_assign($p_bug_id, db_result($result));
+ }
+ }
+
+ }
+
return true;
}
diff -Pur mantis-1.1.2/core/checkin.php bugs-test/core/checkin.php
--- mantis-1.1.2/core/checkin.php 2007-11-01 08:12:03.000000000 +0000
+++ bugs-test/core/checkin.php 2008-07-03 19:20:51.000000000 +0100
@@ -34,13 +34,6 @@
exit( 1 );
}
- # Check that the username is set and exists
- $t_username = config_get( 'source_control_account' );
- if ( is_blank( $t_username ) || ( user_get_id_by_name( $t_username ) === false ) ) {
- echo "Invalid source control account ('$t_username').\n";
- exit( 1 );
- }
-
if ( !defined( "STDIN" ) ) {
define("STDIN", fopen('php://stdin','r'));
}
@@ -49,6 +42,10 @@
$t_commit_regexp = config_get( 'source_control_regexp' );
$t_commit_fixed_regexp = config_get( 'source_control_fixed_regexp' );
+ # Try to use correct user for adding the issue. -- Dataforce 04/01/08
+ $t_commit_person_regexp = config_get( 'source_control_person_regexp' );
+ $person = '';
+
$t_comment = '';
$t_issues = array();
$t_fixed_issues = array();
@@ -65,6 +62,31 @@
$t_fixed_issues[] = $t_matches[1][$i];
}
}
+
+ # Try to use correct user for adding the issue. -- Dataforce 04/01/08
+ if (!is_blank($t_commit_person_regexp) && is_blank($person)) {
+ if (preg_match($t_commit_person_regexp, $t_comment, $t_matches)) {
+ $person = $t_matches[1];
+ }
+ }
+
+ }
+
+ # Try to use correct user for adding the issue. -- Dataforce 04/01/08
+ $t_username = '';
+ if (!is_blank($person)) {
+ $t_username_map = config_get( 'source_control_account_map' );
+ $person = strtolower($person);
+ if (!is_blank($t_username_map) && isset($t_username_map[$person]) && ( user_get_id_by_name( $t_username_map[$person] ) !== false )) {
+ $t_username = $t_username_map[$person];
+ }
+ }
+ if (is_blank($t_username)) {
+ $t_username = config_get( 'source_control_account' );
+ if ( is_blank( $t_username ) || ( user_get_id_by_name( $t_username ) === false ) ) {
+ echo "Invalid source control account ('$t_username').\n";
+ exit( 1 );
+ }
}
# If no issues found, then no work to do.
diff -Pur mantis-1.1.2/core/custom_function_api.php bugs-test/core/custom_function_api.php
--- mantis-1.1.2/core/custom_function_api.php 2007-10-13 23:36:41.000000000 +0100
+++ bugs-test/core/custom_function_api.php 2008-07-03 19:20:51.000000000 +0100
@@ -51,7 +51,7 @@
echo ' (', prepare_user_name( $t_bug->handler_id ), ')';
}
- echo ' - ', get_enum_element( 'status', $t_bug->status ), '.
';
+ echo ' - ', get_enum_element( 'severity', $t_bug->severity ), '.
';
}
# --------------------
@@ -196,7 +196,19 @@
if ( $p_columns_target == COLUMNS_TARGET_CSV_PAGE ) {
$t_columns = config_get( 'csv_columns' );
} else if ( $p_columns_target == COLUMNS_TARGET_VIEW_PAGE ) {
- $t_columns = config_get( 'view_issues_page_columns' );
+// $t_columns = config_get( 'view_issues_page_columns' );
+
+ require_once( 'core.php' );
+ $t_current_user_id = auth_get_current_user_id();
+
+ $all_columns = config_get( 'view_issues_page_columns' );
+ $current_username = strtolower(user_get_field( $t_current_user_id, 'username' ));
+
+ if (isset($all_columns[$current_username])) {
+ $t_columns = $all_columns[$current_username];
+ } else {
+ $t_columns = $all_columns['default'];
+ }
} else {
$t_columns = config_get( 'print_issues_page_columns' );
}
diff -Pur mantis-1.1.2/core/filter_api.php bugs-test/core/filter_api.php
--- mantis-1.1.2/core/filter_api.php 2008-05-22 04:08:16.000000000 +0100
+++ bugs-test/core/filter_api.php 2008-07-03 19:20:51.000000000 +0100
@@ -1065,7 +1065,7 @@
$t_any_found = false;
$c_rel_type = $t_filter['relationship_type'];
$c_rel_bug = $t_filter['relationship_bug'];
- if ( -1 == $c_rel_type || 0 == $c_rel_bug) {
+ if ( -1 == $c_rel_type) {
$t_any_found = true;
}
if ( !$t_any_found ) {
@@ -1565,7 +1565,6 @@
}
?>
-
|