mantisbt manage_config_email_page.php,1.2,1.3 manage_config_work_threshold_page.php,1.1,1.2 manage_config_workflow_page.php,1.2,1.3

Update of /cvsroot/mantisbt/mantisbt
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32387

Modified Files:
        manage_config_email_page.php 
        manage_config_work_threshold_page.php 
        manage_config_workflow_page.php 
Log Message:
fix for 0005365: Wrong defaulting for workflow transitions
made global vs specific project settings clearer to user


Index: manage_config_workflow_page.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/manage_config_workflow_page.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- manage_config_workflow_page.php     27 Feb 2005 15:33:01 -0000      1.2
+++ manage_config_workflow_page.php     20 Mar 2005 14:34:03 -0000      1.3
@@ -153,13 +153,28 @@
 
        # count arcs in and out of each status
        $t_enum_status = config_get( 'status_enum_string' );
+       $t_status_arr  = explode_enum_string( $t_enum_status );
+
        $t_enum_workflow = config_get( 'status_enum_workflow' );
+       if ( 0 == count( $t_enum_workflow ) ) {
+           # workflow is not set, default it to all transitions
+           foreach ( $t_status_arr as $t_status ) {
+                   list( $t_status_id, $t_status_label ) = explode_enum_arr( 
$t_status );
+                   $t_temp_workflow = array();
+                       foreach ( $t_status_arr as $t_next ) {
+                               list( $t_next_id, $t_next_label ) = 
explode_enum_arr( $t_next );
+                               if ( $t_status_id <> $t_next_id ) {
+                                   $t_temp_workflow[] = $t_next;
+                               }
+                       }
+                   $t_enum_workflow[$t_status_id] = implode( ',', 
$t_temp_workflow );
+               }
+       }
 
        $t_extra_enum_status = '0:non-existent,' . $t_enum_status;
        $t_lang_enum_status = '0:' . lang_get( 'non_existent' ) . ',' . 
lang_get( 'status_enum_string' );
        $t_all_status = explode( ',', $t_extra_enum_status);
 
-       $t_status_arr  = explode_enum_string( $t_enum_status );
        $t_entry = array();
        $t_exit = array();
        $t_validation_result = '';
@@ -234,7 +249,12 @@
        if ( $t_can_change_flags ) {
                echo "<form name=\"workflow_config_action\" method=\"post\" 
action=\"manage_config_workflow_set.php\">\n";
        }
-       echo '<p class="form-title">' . lang_get( 'project_name' ) . ': ' . 
project_get_name( $t_project ) . '</p>' . "\n";
+       if ( ALL_PROJECTS == $t_project ) {
+           $t_project_title = lang_get( 'config_all_projects' );
+       } else {
+           $t_project_title = sprintf( lang_get( 'config_project' ) , 
project_get_name( $t_project ) );
+       }
+       echo '<p class="bold">' . $t_project_title . '</p>' . "\n";
 
 
        # show the settings used to derive the table

Index: manage_config_email_page.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/manage_config_email_page.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- manage_config_email_page.php        27 Feb 2005 15:33:01 -0000      1.2
+++ manage_config_email_page.php        20 Mar 2005 14:34:03 -0000      1.3
@@ -98,6 +98,13 @@
                        echo "<form name=\"mail_config_action\" method=\"post\" 
action=\"manage_config_email_set.php\">\n";
                }
 
+           if ( ALL_PROJECTS == $t_project ) {
+               $t_project_title = lang_get( 'config_all_projects' );
+           } else {
+               $t_project_title = sprintf( lang_get( 'config_project' ) , 
project_get_name( $t_project ) );
+           }
+           echo '<p class="bold">' . $t_project_title . '</p>' . "\n";
+           
                get_section_begin_for_email( lang_get( 'email_notification' ) );
                get_capability_row_for_email( lang_get( 'email_on_new' ), 'new' 
);
                get_capability_row_for_email( lang_get( 'email_on_assigned' ), 
'owner' );

Index: manage_config_work_threshold_page.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/manage_config_work_threshold_page.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- manage_config_work_threshold_page.php       19 Mar 2005 16:25:59 -0000      
1.1
+++ manage_config_work_threshold_page.php       20 Mar 2005 14:34:03 -0000      
1.2
@@ -149,7 +149,14 @@
        }
 
     echo "<br /><br />\n";
-       echo '<p class="form-title">' . lang_get( 'project_name' ) . ': ' . 
project_get_name( $t_project ) . '</p>' . "\n";
+    
+       if ( ALL_PROJECTS == $t_project ) {
+           $t_project_title = lang_get( 'config_all_projects' );
+       } else {
+           $t_project_title = sprintf( lang_get( 'config_project' ) , 
project_get_name( $t_project ) );
+       }
+       echo '<p class="bold">' . $t_project_title . '</p>' . "\n";
+       
        echo "<form name=\"mail_config_action\" method=\"post\" 
action=\"manage_config_work_threshold_set.php\">\n";
 
        # Issues



-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click