Index: openacs-4/packages/evaluation/lib/evaluations-chunk.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/lib/evaluations-chunk.adp,v diff -u -r1.6 -r1.7 --- openacs-4/packages/evaluation/lib/evaluations-chunk.adp 10 Jul 2009 16:51:28 -0000 1.6 +++ openacs-4/packages/evaluation/lib/evaluations-chunk.adp 13 Jul 2009 12:19:21 -0000 1.7 @@ -3,7 +3,8 @@
- @@ -12,7 +13,7 @@ - + Index: openacs-4/packages/evaluation/lib/evaluations-chunk.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/lib/evaluations-chunk.tcl,v diff -u -r1.20 -r1.21 --- openacs-4/packages/evaluation/lib/evaluations-chunk.tcl 10 Jun 2009 00:49:09 -0000 1.20 +++ openacs-4/packages/evaluation/lib/evaluations-chunk.tcl 13 Jul 2009 12:19:21 -0000 1.21 @@ -79,7 +79,7 @@ lappend elements edit \ [list label "" \ sub_class narrow \ - display_template {
[_ evaluation-portlet.edit]
[_ evaluation-portlet.delete]
}] + display_template {
[_ evaluation-portlet.edit]
[_ evaluation-portlet.delete]
}] } else { lappend elements audit_info \ [list label "" \ @@ -135,7 +135,7 @@ } lappend elements answer \ [list label "" \ - display_template {@grade_tasks.answer;noquote@} \ + display_template {@grade_tasks.answer;noquote@} \ link_html { title "[_ evaluation-portlet.View_my_answer_]" }] set multirow_name grade_tasks @@ -151,8 +151,10 @@ set solution_label "" +set suffix [ad_generate_random_string 4] +set list_name "grade_tasks_${suffix}" template::list::create \ - -name grade_tasks \ + -name $list_name \ -multirow $multirow_name \ -key task_id \ -pass_properties { return_url mode base_url bottom_line max_grade_label max_weight_label solution_label submitted_label grade_of_label} \ @@ -165,7 +167,7 @@ -sub_class narrow \ -orderby { default_value task_name } -set evaluations_orderby [template::list::orderby_clause -orderby -name grade_tasks] +set evaluations_orderby [template::list::orderby_clause -orderby -name $list_name] if { [string equal $evaluations_orderby ""] } { set evaluations_orderby " order by task_name asc" Index: openacs-4/packages/evaluation/lib/tasks-chunk.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/lib/tasks-chunk.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/evaluation/lib/tasks-chunk.adp 11 Sep 2004 00:49:20 -0000 1.2 +++ openacs-4/packages/evaluation/lib/tasks-chunk.adp 13 Jul 2009 12:19:21 -0000 1.3 @@ -1,3 +1,3 @@ - + Index: openacs-4/packages/evaluation/lib/tasks-chunk.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/lib/tasks-chunk.tcl,v diff -u -r1.19 -r1.20 --- openacs-4/packages/evaluation/lib/tasks-chunk.tcl 13 Jul 2009 11:39:10 -0000 1.19 +++ openacs-4/packages/evaluation/lib/tasks-chunk.tcl 13 Jul 2009 12:19:21 -0000 1.20 @@ -38,19 +38,19 @@ lappend elements view \ [list label "" \ sub_class narrow \ - display_template {} \ + display_template {#evaluation-portlet.View_task_#} \ link_url_eval {[export_vars -base "${base_url}admin/tasks/task-add-edit" { grade_id task_id mode return_url }]} \ link_html { title "[_ evaluation-portlet.View_task_]" }] lappend elements edit \ [list label "" \ sub_class narrow \ - display_template {} \ + display_template {#evaluation-portlet.Edit_task_#} \ link_url_eval {[export_vars -base "${base_url}admin/tasks/task-add-edit" { grade_id return_url item_id task_id }]} \ link_html { title "[_ evaluation-portlet.Edit_task_]" }] lappend elements delete \ [list label "" \ sub_class narrow \ - display_template {} \ + display_template {#evaluation-portlet.Delete_task_#} \ link_url_eval {[export_vars -base "${base_url}admin/tasks/task-delete" { grade_id task_id return_url }]} \ link_html { title "[_ evaluation-portlet.Delete_task_]" }] @@ -61,20 +61,21 @@ lappend elements answer \ [list label "" \ link_url_col answer_url \ - display_template { @tasks.answer;noquote@ } \ link_html { title "[_ evaluation-portlet.Addedit_answer_]" }] lappend elements view \ [list label "" \ sub_class narrow \ - display_template {} \ + display_template {#evaluation-portlet.View_task_#} \ link_url_eval {[export_vars -base "${base_url}task-view" { grade_id task_id return_url }]} \ link_html { title "[_ evaluation-portlet.View_task_]" }] set multirow_name tasks set actions "" } +set suffix [ad_generate_random_string 4] +set list_name "tasks_${suffix}" template::list::create \ - -name tasks \ + -name $list_name \ -multirow $multirow_name \ -actions $actions \ -key task_id \ @@ -85,7 +86,7 @@ -elements $elements \ -orderby { default_value task_name } -set assignments_orderby [template::list::orderby_clause -orderby -name tasks] +set assignments_orderby [template::list::orderby_clause -orderby -name $list_name] if {[string equal $assignments_orderby ""]} { set assignments_orderby " order by task_name asc"
@grade_plural_name@ (@grade_weight@% #evaluation-portlet.total_grade#) + + @grade_plural_name@ (@grade_weight@% #evaluation-portlet.total_grade#) @actions;noquote@