Property changes on: . ___________________________________________________________________ Name: svn:ignore - !core custom_constant_inc.php custom_strings_inc.php custom_functions_inc.php config_inc.php .#* .project project.index .DS_Store custom_relationships_inc.php + !core custom_constant_inc.php custom_strings_inc.php custom_functions_inc.php config_inc.php .#* .project project.index .DS_Store custom_relationships_inc.php jpgraph avatar Index: query_store_page.php =================================================================== --- query_store_page.php (revision 5305) +++ query_store_page.php (working copy) @@ -40,6 +40,11 @@
- + + + + + '; html_page_bottom1( __FILE__ ); Index: view_filters_page.php =================================================================== --- view_filters_page.php (revision 5305) +++ view_filters_page.php (working copy) @@ -97,6 +97,7 @@ $t_filter_cols = config_get( 'filter_custom_fields_per_row' ); $t_custom_cols = 1; $t_custom_rows = 0; + $f_source_query_id = gpc_get_string( 'source_query_id' , null); #get valid target fields $t_fields = helper_get_columns_to_view(); @@ -180,7 +181,11 @@+ | + + | ++ + | ++ + | ++ + | ++ + | ++ + | ++ | + |
'; - if ( OFF != $t_rss_enabled ) { # Use the "new" RSS link style. print_rss( rss_get_issues_feed_url( null, null, $t_id ), lang_get( 'rss' ) ); echo ' '; } + print ' | '; - print '' . string_display( $t_name ) . ''; + print ''; + print string_display( $filter_row['id'] ); + print ' | '; + print ''; + print string_display( $filter_row['name'] ); + print ' | '; + + print ''; + print '' . string_display( lang_get_defaulted($t_name) ) . ''; + print ' | '; + + print ''; + print '' . string_display( user_get_name($filter_row['user_id']) ) . ''; + print ' | '; + + print ''; + if ($filter_row['project_id'] == ALL_PROJECTS) { + print string_display( lang_get_defaulted(all_projects) ); + } else { + print string_display( project_get_field($filter_row['project_id'], 'name')); + } + print ' | '; + + print ''; + print ''; + print ' | '; + + print ''; if ( filter_db_can_delete_filter( $t_id ) ) { echo ' '; print_button( $t_delete_query_url . db_prepare_int( $t_id ), lang_get( 'delete_query' ) ); } - print ' | '; - $t_column_count++; - if ( $t_column_count == $t_max_column_count ) { - print ''; + print_button( $t_edit_query_url . db_prepare_int( $t_id ), lang_get( 'edit_query' ) ); + print ' | '; - # Tidy up this row - if ( ( $t_column_count > 0 ) && ( $t_column_count < $t_max_column_count ) ) { - for ( $i = $t_column_count; $i < $t_max_column_count; $i++ ) { - print ''; - } print ''; } ?> |
+ | + + | ++ + | ++ + | ++ + | ++ + | ++ + | ++ | + |
'; - if ( OFF != $t_rss_enabled ) { # Use the "new" RSS link style. print_rss( rss_get_issues_feed_url( null, null, $t_id ), lang_get( 'rss' ) ); echo ' '; } + print ' | '; - print '' . string_display( $t_name ) . ''; + print ''; + print string_display( $filter_row['id'] ); + print ' | '; + print ''; + print string_display( $filter_row['name'] ); + print ' | '; + + print ''; + print '' . string_display( lang_get_defaulted($t_name) ) . ''; + print ' | '; + + print ''; + print '' . string_display( user_get_name($filter_row['user_id']) ) . ''; + print ' | '; + + print ''; + if ($filter_row['project_id'] == ALL_PROJECTS) { + print string_display( lang_get_defaulted(all_projects) ); + } else { + print string_display( project_get_field($filter_row['project_id'], 'name')); + } + print ' | '; + + print ''; + print ''; + print ' | '; + + print ''; if ( filter_db_can_delete_filter( $t_id ) ) { echo ' '; print_button( $t_delete_query_url . db_prepare_int( $t_id ), lang_get( 'delete_query' ) ); } - print ' | '; - $t_column_count++; - if ( $t_column_count == $t_max_column_count ) { - print ''; + print_button( $t_edit_query_url . db_prepare_int( $t_id ), lang_get( 'edit_query' ) ); + print ' | '; - # Tidy up this row - if ( ( $t_column_count > 0 ) && ( $t_column_count < $t_max_column_count ) ) { - for ( $i = $t_column_count; $i < $t_max_column_count; $i++ ) { - print ''; - } print ''; } ?> |