diff -u -r mantis-120rc2-original/mantisbt-1.2.0rc2/bug_report_page.php mantis-120rc2-gtz/mantisbt-1.2.0rc2/bug_report_page.php
--- mantis-120rc2-original/mantisbt-1.2.0rc2/bug_report_page.php 2010-01-12 15:55:59.485813285 +0300
+++ mantis-120rc2-gtz/mantisbt-1.2.0rc2/bug_report_page.php 2010-01-14 09:27:47.010647678 +0300
@@ -170,6 +170,26 @@
+
>
+
+ *
+ |
+
+
+ |
+
+
>
@@ -437,8 +459,8 @@
CUSTOM_FIELD_SEQUENCE_ALL ) {
$t_custom_field_table = db_get_table( 'mantis_custom_field_table' );
$t_custom_field_project_table = db_get_table( 'mantis_custom_field_project_table' );
@@ -848,10 +853,16 @@
} else {
$t_project_clause = '= ' . $p_project_id;
}
+
+ $sequence_filters =
+ array( CUSTOM_FIELD_SEQUENCE_ALL => "",
+ CUSTOM_FIELD_SEQUENCE_TOP => "AND sequence <0 ",
+ CUSTOM_FIELD_SEQUENCE_BOTTOM => "AND sequence >= 0" );
+ $sequence_filter = $sequence_filters[$p_sequence];
$query = "SELECT cft.id
FROM $t_custom_field_table cft, $t_custom_field_project_table cfpt
WHERE cfpt.project_id $t_project_clause AND
- cft.id = cfpt.field_id
+ cft.id = cfpt.field_id $sequence_filter
ORDER BY sequence ASC, name ASC";
}
$result = db_query( $query );
@@ -863,8 +874,8 @@
array_push( $t_ids, $row['id'] );
}
custom_field_cache_array_rows( $t_ids );
-
- $g_cache_cf_linked[$p_project_id] = $t_ids;
+ if ( $p_sequence == CUSTOM_FIELD_SEQUENCE_ALL ) # cache only the full list
+ $g_cache_cf_linked[$p_project_id] = $t_ids;
} else {
$t_ids = $g_cache_cf_linked[$p_project_id];
}
diff -u -r mantis-120rc2-original/mantisbt-1.2.0rc2/lang/strings_english.txt mantis-120rc2-gtz/mantisbt-1.2.0rc2/lang/strings_english.txt
--- mantis-120rc2-original/mantisbt-1.2.0rc2/lang/strings_english.txt 2010-01-12 15:55:59.835807912 +0300
+++ mantis-120rc2-gtz/mantisbt-1.2.0rc2/lang/strings_english.txt 2010-01-14 09:30:41.198369160 +0300
@@ -1290,6 +1290,7 @@
$s_linked_projects = 'Linked Projects';
$s_custom_field_sequence = 'Sequence';
+$s_custom_field_sequence_help = 'Use negative numbers to display field on the report page before the standard fields.';
$s_custom_field_type_enum_string = '0:String,1:Numeric,2:Float,3:Enumeration,4:E-mail,5:Checkbox,6:List,7:Multiselection list,8:Date,9:Radio';
$s_confirm_used_custom_field_deletion = 'This field is currently linked to at least one project. If you continue all values for this field will be permanently deleted. This action cannot be undone. If you do not want to delete this field, hit the Back button in your browser. To proceed, click the button below';
diff -u -r mantis-120rc2-original/mantisbt-1.2.0rc2/manage_custom_field_edit_page.php mantis-120rc2-gtz/mantisbt-1.2.0rc2/manage_custom_field_edit_page.php
--- mantis-120rc2-original/mantisbt-1.2.0rc2/manage_custom_field_edit_page.php 2010-01-12 15:55:59.505814500 +0300
+++ mantis-120rc2-gtz/mantisbt-1.2.0rc2/manage_custom_field_edit_page.php 2010-01-12 15:34:51.127655751 +0300
@@ -271,7 +271,8 @@
:
-
+
+
|