Skip to content

Commit

Permalink
Modified print_enum_string_option_list() to work better.
Browse files Browse the repository at this point in the history 
git-svn-id: http://mantisbt.svn.sourceforge.net/svnroot/mantisbt/trunk@822 f5dc347c-c33d-0410-90a0-b07cc1902cb9
  • Loading branch information
Kenzaburo Ito committed Mar 28, 2002
1 parent 8cb4f10 commit e304dab
Show file tree
Hide file tree
Showing 13 changed files with 36 additions and 28 deletions.
2 changes: 1 addition & 1 deletion bug_resolve_page.php
View file
Expand Up @@ -32,7 +32,7 @@
</td>
<td>
<select name="f_resolution">
<?php print_enum_string_option_list( $s_resolution_enum_string, FIXED ) ?>
<?php print_enum_string_option_list( "resolution", FIXED ) ?>
</select>
</td>
</tr>
Expand Down
12 changes: 6 additions & 6 deletions bug_update_advanced_page.php
View file
Expand Up @@ -105,12 +105,12 @@
</td>
<td>
<select name="f_severity">
<?php print_enum_string_option_list( $s_severity_enum_string, $v_severity ) ?>
<?php print_enum_string_option_list( "severity", $v_severity ) ?>
</select>
</td>
<td>
<select name="f_reproducibility">
<?php print_enum_string_option_list( $s_reproducibility_enum_string, $v_reproducibility ) ?>
<?php print_enum_string_option_list( "reproducibility", $v_reproducibility ) ?>
</select>
</td>
<td>
Expand Down Expand Up @@ -150,7 +150,7 @@
</td>
<td align="left">
<select name="f_priority">
<?php print_enum_string_option_list( $s_priority_enum_string, $v_priority ) ?>
<?php print_enum_string_option_list( "priority", $v_priority ) ?>
</select>
</td>
<td class="category">
Expand All @@ -172,7 +172,7 @@
</td>
<td>
<select name="f_status">
<?php print_enum_string_option_list( $s_status_enum_string, $v_status ) ?>
<?php print_enum_string_option_list( "status", $v_status ) ?>
</select>
</td>
<td class="category">
Expand All @@ -194,7 +194,7 @@
</td>
<td>
<select name="f_projection">
<?php print_enum_string_option_list( $s_projection_enum_string, $v_projection ) ?>
<?php print_enum_string_option_list( "projection", $v_projection ) ?>
</select>
</td>
<td colspan="2">
Expand All @@ -213,7 +213,7 @@
</td>
<td>
<select name="f_eta">
<?php print_enum_string_option_list( $s_eta_enum_string, $v_eta ) ?>
<?php print_enum_string_option_list( "eta", $v_eta ) ?>
</select>
</td>
<td colspan="2">
Expand Down
8 changes: 4 additions & 4 deletions bug_update_page.php
View file
Expand Up @@ -114,12 +114,12 @@
</td>
<td>
<select name="f_severity">
<?php print_enum_string_option_list( $s_severity_enum_string, $v_severity ) ?>
<?php print_enum_string_option_list( "severity", $v_severity ) ?>
</select>
</td>
<td>
<select name="f_reproducibility">
<?php print_enum_string_option_list( $s_reproducibility_enum_string, $v_reproducibility ) ?>
<?php print_enum_string_option_list( "reproducibility", $v_reproducibility ) ?>
</select>
</td>
<td>
Expand Down Expand Up @@ -159,7 +159,7 @@
</td>
<td>
<select name="f_priority">
<?php print_enum_string_option_list( $s_priority_enum_string, $v_priority ) ?>
<?php print_enum_string_option_list( "priority", $v_priority ) ?>
</select>
</td>
<td class="category">
Expand All @@ -178,7 +178,7 @@
</td>
<td>
<select name="f_status">
<?php print_enum_string_option_list( $s_status_enum_string, $v_status ) ?>
<?php print_enum_string_option_list( "status", $v_status ) ?>
</select>
</td>
<td class="category">
Expand Down
17 changes: 12 additions & 5 deletions core_print_API.php
View file
Expand Up @@ -407,15 +407,22 @@ function print_version_option_list( $p_version="" ) {
}
}
# --------------------
function print_enum_string_option_list( $p_enum_string, $p_val=0 ) {
$t_arr = explode_enum_string( $p_enum_string);
# select the proper enum values based on the input parameter
# we use variable variables in order to achieve this
function print_enum_string_option_list( $p_enum_name, $p_val=0 ) {
$g_var = "g_".$p_enum_name."_enum_string";
$s_var = "s_".$p_enum_name."_enum_string";
global $$g_var, $$s_var;

$t_arr = explode_enum_string( $$g_var );
$enum_count = count( $t_arr );
for ($i=0;$i<$enum_count;$i++) {
$t_elem = explode_enum_arr( $t_arr[$i] );
$t_elem = explode_enum_arr( $t_arr[$i] );
$t_elem2 = get_enum_element( $$s_var, $t_elem[0] );
if ( $t_elem[0] == $p_val ) {
PRINT "<option value=\"$t_elem[0]\" SELECTED>$t_elem[1]</option>";
PRINT "<option value=\"$t_elem[0]\" SELECTED>$t_elem2</option>";
} else {
PRINT "<option value=\"$t_elem[0]\">$t_elem[1]</option>";
PRINT "<option value=\"$t_elem[0]\">$t_elem2</option>";
}
} # end for
}
Expand Down
1 change: 1 addition & 0 deletions doc/ChangeLog
View file
Expand Up @@ -15,6 +15,7 @@ Mantis
* Modified news posting to properly limit project lists for non Administrators.
* Modified reset password functionality to use g_send_reset_password to determine whether a password is set to blank or emailed to the user.
* Modified color legend is now generated form the $g_status_enum_string variable.
* Modified print_enum_string_option_list() to work better.
* Added Hungarian translation.
* Added g_bug_link_tag to let users customize how to create bug links.
* Added a "jump to bugnotes" quicklink at the top of the view bug pages.
Expand Down
2 changes: 1 addition & 1 deletion manage_create_user_page.php
View file
Expand Up @@ -62,7 +62,7 @@
</td>
<td>
<select name="f_access_level">
<?php print_enum_string_option_list( $s_access_levels_enum_string, REPORTER ) ?>
<?php print_enum_string_option_list( "access_levels", REPORTER ) ?>
</select>
</td>
</tr>
Expand Down
2 changes: 1 addition & 1 deletion manage_proj_edit_page.php
View file
Expand Up @@ -59,7 +59,7 @@
</td>
<td>
<select name="f_status">
<?php print_enum_string_option_list( $s_project_status_enum_string, $v_status ) ?>
<?php print_enum_string_option_list( "project_status", $v_status ) ?>
</select>
</td>
</tr>
Expand Down
2 changes: 1 addition & 1 deletion manage_proj_menu_page.php
View file
Expand Up @@ -57,7 +57,7 @@
</td>
<td>
<select name="f_status">
<?php print_enum_string_option_list( $s_project_status_enum_string ) ?>
<?php print_enum_string_option_list( "project_status" ) ?>
</select>
</td>
</tr>
Expand Down
2 changes: 1 addition & 1 deletion manage_user_page.php
View file
Expand Up @@ -55,7 +55,7 @@
</td>
<td colspan="2">
<select name="f_access_level">
<?php print_enum_string_option_list( $s_access_levels_enum_string, $u_access_level ) ?>
<?php print_enum_string_option_list( "access_levels", $u_access_level ) ?>
</select>
</td>
</tr>
Expand Down
4 changes: 2 additions & 2 deletions print_all_bug_page.php
View file
Expand Up @@ -282,14 +282,14 @@
<select name="f_show_severity">
<option value="any"><?php echo $s_any ?></option>
<option value="any"></option>
<?php print_enum_string_option_list( $s_severity_enum_string, $f_show_severity ) ?>
<?php print_enum_string_option_list( "severity", $f_show_severity ) ?>
</select>
</td>
<td>
<select name="f_show_status">
<option value="any"><?php echo $s_any ?></option>
<option value="any"></option>
<?php print_enum_string_option_list( $s_status_enum_string, $f_show_status ) ?>
<?php print_enum_string_option_list( "status", $f_show_status ) ?>
</select>
</td>
<td>
Expand Down
4 changes: 2 additions & 2 deletions report_bug_advanced_page.php
View file
Expand Up @@ -120,7 +120,7 @@
<td>
<select name="f_reproducibility">
<option value="" SELECTED><?php echo $s_select_reproducibility ?></option>
<?php print_enum_string_option_list( $s_reproducibility_enum_string, $f_reproducibility ) ?>
<?php print_enum_string_option_list( "reproducibility", $f_reproducibility ) ?>
</select>
</td>
</tr>
Expand All @@ -132,7 +132,7 @@
<td>
<select name="f_severity">
<option value="" SELECTED><?php echo $s_select_severity ?></option>
<?php print_enum_string_option_list( $s_severity_enum_string, $f_severity ) ?>
<?php print_enum_string_option_list( "severity", $f_severity ) ?>
</select>
</td>
</tr>
Expand Down
4 changes: 2 additions & 2 deletions report_bug_page.php
View file
Expand Up @@ -86,7 +86,7 @@
<td>
<select name="f_reproducibility">
<option value="" SELECTED><?php echo $s_select_reproducibility ?></option>
<?php print_enum_string_option_list( $s_reproducibility_enum_string, $f_reproducibility ) ?>
<?php print_enum_string_option_list( "reproducibility", $f_reproducibility ) ?>
</select>
</td>
</tr>
Expand All @@ -97,7 +97,7 @@
<td>
<select name="f_severity">
<option value="" selected><?php echo $s_select_severity ?></option>
<?php print_enum_string_option_list( $s_severity_enum_string, $f_severity ) ?>
<?php print_enum_string_option_list( "severity", $f_severity ) ?>
</select>
</td>
</tr>
Expand Down
4 changes: 2 additions & 2 deletions view_all_inc.php
View file
Expand Up @@ -60,14 +60,14 @@
<select name="f_show_severity">
<option value="any"><?php echo $s_any ?></option>
<option value="any"></option>
<?php print_enum_string_option_list( $s_severity_enum_string, $f_show_severity ) ?>
<?php print_enum_string_option_list( "severity", $f_show_severity ) ?>
</select>
</td>
<td>
<select name="f_show_status">
<option value="any"><?php echo $s_any ?></option>
<option value="any"></option>
<?php print_enum_string_option_list( $s_status_enum_string, $f_show_status ) ?>
<?php print_enum_string_option_list( "status", $f_show_status ) ?>
</select>
</td>
<td>
Expand Down

0 comments on commit e304dab

Please sign in to comment.