Index: openacs-4/packages/bug-tracker/lib/pagination.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/lib/pagination.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/bug-tracker/lib/pagination.tcl 14 Oct 2013 18:14:21 -0000 1.3 +++ openacs-4/packages/bug-tracker/lib/pagination.tcl 23 Jun 2015 16:05:05 -0000 1.4 @@ -17,17 +17,20 @@ lappend export_var_list $var_name } -set pagination_filter_base_url "[ad_conn url]?[export_vars -url -exclude { offset } [concat $export_var_list interval_size]]" -set pagination_form_export_vars "[export_vars -form [concat $export_var_list offset]]" +set pagination_filter_base_url [export_vars -base [ad_conn url] -exclude { offset } [concat $export_var_list interval_size]] +set pagination_form_export_vars [export_vars -form [concat $export_var_list offset]] while { $interval_low <= $row_count } { if { $interval_high > $row_count } { set interval_high $row_count } - + set href "$pagination_filter_base_url&offset=[expr {$interval_low - 1}]" set interval_label [ad_decode $interval_low $row_count "$interval_high" "$interval_low - $interval_high"] - lappend pagination_filter_list [ad_decode [expr {1 + $offset}] $interval_low "$interval_label" "$interval_label"] + lappend pagination_filter_list [ad_decode [expr {1 + $offset}] \ + $interval_low \ + $interval_label \ + [subst {$interval_label}]] set interval_high [expr {$interval_high + $interval_size}] set interval_low [expr {$interval_high - [expr {$interval_size - 1}]}] Index: openacs-4/packages/bug-tracker/tcl/bug-tracker-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/tcl/bug-tracker-procs.tcl,v diff -u -r1.44 -r1.45 --- openacs-4/packages/bug-tracker/tcl/bug-tracker-procs.tcl 6 Aug 2014 16:25:19 -0000 1.44 +++ openacs-4/packages/bug-tracker/tcl/bug-tracker-procs.tcl 23 Jun 2015 16:05:05 -0000 1.45 @@ -1196,9 +1196,9 @@ set bug_number [lindex $bug_item 1] set bug_summary [lindex $bug_item 0] - set unmap_url "unmap-patch-from-bug?[export_vars -url { patch_number bug_number } ]" + set unmap_url [export_vars -base unmap-patch-from-bug -url { patch_number bug_number } ] if { $write_or_submitter_p } { - set unmap_link "([_ bug-tracker.unmap])" + set unmap_link [subst {([_ bug-tracker.unmap])}] } else { set unmap_link "" } @@ -1475,11 +1475,17 @@ set delete_url [export_vars -base "related-file-delete" {bug_id related_object_id return_url}] set new_version_url [export_vars -base "related-file-update" {bug_id related_object_id return_url}] if { ( $related_creation_user == $user_id ) || $admin_p } { - set extra_actions " | [_ bug-tracker.upload_new_version] | [_ bug-tracker.delete]" + set extra_actions [subst { | + [_ bug-tracker.upload_new_version] | + [_ bug-tracker.delete] + }] } else { set extra_actions "" } - lappend related_files_list "$related_title [_ bug-tracker.download] | [_ bug-tracker.properties]${extra_actions}" + lappend related_files_list [subst {$related_title + [_ bug-tracker.download] | + [_ bug-tracker.properties]$extra_actions + }] } if_no_rows { set related_files_string [_ bug-tracker.No_related_files] } @@ -1520,11 +1526,17 @@ set delete_url [export_vars -base "related-file-delete" {bug_id related_object_id return_url}] set new_version_url [export_vars -base "related-file-update" {bug_id related_object_id return_url}] if { ( $related_creation_user == $user_id ) || $admin_p } { - set extra_actions " | upload new version | delete" + set extra_actions [subst { | + upload new version | + delete + }] } else { set extra_actions "" } - lappend related_files_list "$related_title download | properties${extra_actions}" + lappend related_files_list [subsr {$related_title + download | + properties$extra_actions + }] } if_no_rows { set related_files_string [_ bug-tracker.No_related_files] } Index: openacs-4/packages/bug-tracker/www/map-patch-to-bugs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/map-patch-to-bugs.tcl,v diff -u -r1.10 -r1.11 --- openacs-4/packages/bug-tracker/www/map-patch-to-bugs.tcl 6 Aug 2014 16:25:20 -0000 1.10 +++ openacs-4/packages/bug-tracker/www/map-patch-to-bugs.tcl 23 Jun 2015 16:05:05 -0000 1.11 @@ -66,29 +66,40 @@ if { $component_id ne "" } { set component_name [bug_tracker::component_get_name -component_id $component_id] - set component_filter_url "map-patch-to-bugs?[export_vars -url {patch_number component_id return_url offset show_only_open_p interval_size}]" + set component_filter_url [export_vars -base map-patch-to-bugs {patch_number component_id return_url offset show_only_open_p interval_size}] if { $show_all_components_p } { - set component_filter "\[ [_ bug-tracker.Only] | [_ bug-tracker.All_1] \]" + set component_filter [subst {\[ + [_ bug-tracker.Only] | + [_ bug-tracker.All_1] \]}] } else { set component_where_clause "\n and bt_bugs.component_id = :component_id" - set component_filter "\[ [_ bug-tracker.Only_1] | [_ bug-tracker.All_1] \]" + set component_filter [subst {\[ + [_ bug-tracker.Only_1] | + [_ bug-tracker.All_1] \]}] } } # Build the bug status filter set workflow_id [bug_tracker::bug::get_instance_workflow_id] set initial_state_id [workflow::fsm::get_initial_state -workflow_id $workflow_id] -set open_filter_url "map-patch-to-bugs?[export_vars -url {patch_number component_id return_url offset show_all_components_p interval_size}]" +set open_filter_url [export_vars -base map-patch-to-bugs { + patch_number component_id return_url offset show_all_components_p interval_size +}] set only_open_label [_ bug-tracker.Only_2] set any_status_label [_ bug-tracker.Bugs] if { $show_only_open_p } { set open_where_clause "and cfsm.current_state = :initial_state_id" - set open_filter "$only_open_label | $any_status_label" + set open_filter [subst {$only_open_label | + $any_status_label + }] } else { set open_where_clause "" - set open_filter "$only_open_label | $any_status_label" + set open_filter [subst { + $only_open_label | + $any_status_label + }] } set sql_where_clause "bt_bugs.project_id = :package_id Index: openacs-4/packages/bug-tracker/www/send-summary-email.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/send-summary-email.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/bug-tracker/www/send-summary-email.tcl 6 Aug 2014 16:25:20 -0000 1.3 +++ openacs-4/packages/bug-tracker/www/send-summary-email.tcl 23 Jun 2015 16:05:06 -0000 1.4 @@ -81,12 +81,28 @@ # TODO: currently hardcoded html # need to convert to something more configurable - set html_content "

[_ bug-tracker.send_summary_email_header]

" + set html_content [subst { +

[_ bug-tracker.send_summary_email_header]

+
[bug_tracker::conn Bug] [_ bug-tracker.number_symbol][_ bug-tracker.Summary][_ bug-tracker.State][_ bug-tracker.Assigned_To]Priority
+ + + + + + + }] db_foreach get_bugs "" { if {$cat_keyword_id == $p_keyword_id} { set bug_url [export_vars -base "[ad_url][ad_conn package_url]bug" {bug_number}] - append html_content "" + append html_content [subst { + + + + + + + }] } } append html_content "
[bug_tracker::conn Bug] [_ bug-tracker.number_symbol][_ bug-tracker.Summary][_ bug-tracker.State][_ bug-tracker.Assigned_To]Priority
$bug_number$summary$pretty_state$assignee_first_names $assignee_last_name$heading
$bug_number$summary$pretty_state$assignee_first_names $assignee_last_name$heading
"