Index: openacs-4/packages/evaluation/evaluation.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/evaluation.info,v diff -u -r1.37.2.4 -r1.37.2.5 --- openacs-4/packages/evaluation/evaluation.info 15 May 2016 19:54:31 -0000 1.37.2.4 +++ openacs-4/packages/evaluation/evaluation.info 20 May 2016 20:30:12 -0000 1.37.2.5 @@ -7,7 +7,7 @@ f f - + Jose Pablo Escobedo Del Cid This package allows the users (professors and students) to use the system to submit and grade the tasks. 2015-10-04 @@ -16,9 +16,9 @@ 2 #evaluation.Evaluations# - + - + Index: openacs-4/packages/evaluation/www/answer-add-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/answer-add-edit.tcl,v diff -u -r1.19.2.1 -r1.19.2.2 --- openacs-4/packages/evaluation/www/answer-add-edit.tcl 12 Sep 2015 11:06:02 -0000 1.19.2.1 +++ openacs-4/packages/evaluation/www/answer-add-edit.tcl 20 May 2016 20:30:12 -0000 1.19.2.2 @@ -13,7 +13,7 @@ item_id:naturalnum,notnull,optional upload_file:trim,optional upload_file.tmpfile:tmpfile,optional - return_url:notnull + return_url:localurl,notnull } -validate { late_submit -requires { task_id:integer } { if { [string equal [db_string late_turn_in { *SQL* }] "f"] && [db_string compare_dates { *SQL* } -default 0] } { Index: openacs-4/packages/evaluation/www/evaluation-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/evaluation-view.tcl,v diff -u -r1.7.2.1 -r1.7.2.2 --- openacs-4/packages/evaluation/www/evaluation-view.tcl 12 Sep 2015 11:06:02 -0000 1.7.2.1 +++ openacs-4/packages/evaluation/www/evaluation-view.tcl 20 May 2016 20:30:12 -0000 1.7.2.2 @@ -8,7 +8,7 @@ @cvs-id $Id$ } { evaluation_id:naturalnum,notnull - {return_url ""} + {return_url:localurl ""} } set page_title "[_ evaluation.View_Evaluation]" Index: openacs-4/packages/evaluation/www/task-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/task-view.tcl,v diff -u -r1.16.2.1 -r1.16.2.2 --- openacs-4/packages/evaluation/www/task-view.tcl 12 Sep 2015 11:06:03 -0000 1.16.2.1 +++ openacs-4/packages/evaluation/www/task-view.tcl 20 May 2016 20:30:12 -0000 1.16.2.2 @@ -9,7 +9,7 @@ } { grade_id:naturalnum,notnull task_id:naturalnum,notnull - {return_url ""} + {return_url:localurl ""} } set package_id [ad_conn package_id] Index: openacs-4/packages/evaluation/www/admin/version-select.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/version-select.tcl,v diff -u -r1.2.10.1 -r1.2.10.2 --- openacs-4/packages/evaluation/www/admin/version-select.tcl 12 Sep 2015 11:06:03 -0000 1.2.10.1 +++ openacs-4/packages/evaluation/www/admin/version-select.tcl 20 May 2016 20:30:12 -0000 1.2.10.2 @@ -2,7 +2,7 @@ @author Anny Flores (annyflores@viaro.net) Viaro Networks (www.viaro.net) } { - {return_url ""} + {return_url:localurl ""} } set portal_id [dotlrn_community::get_portal_id -community_id [dotlrn_community::get_community_id]] Index: openacs-4/packages/evaluation/www/admin/grades/grades-delete-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/grades-delete-2.tcl,v diff -u -r1.9.2.1 -r1.9.2.2 --- openacs-4/packages/evaluation/www/admin/grades/grades-delete-2.tcl 12 Sep 2015 11:06:05 -0000 1.9.2.1 +++ openacs-4/packages/evaluation/www/admin/grades/grades-delete-2.tcl 20 May 2016 20:30:12 -0000 1.9.2.2 @@ -8,7 +8,7 @@ @cvs-id $Id$ } { grade_id:naturalnum,notnull - return_url + return_url:localurl operation } Index: openacs-4/packages/evaluation/www/admin/grades/grades-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/grades-delete.tcl,v diff -u -r1.11.2.1 -r1.11.2.2 --- openacs-4/packages/evaluation/www/admin/grades/grades-delete.tcl 12 Sep 2015 11:06:05 -0000 1.11.2.1 +++ openacs-4/packages/evaluation/www/admin/grades/grades-delete.tcl 20 May 2016 20:30:12 -0000 1.11.2.2 @@ -10,7 +10,7 @@ } { grade_id:naturalnum,notnull - {return_url "index"} + {return_url:localurl "index"} } set user_id [ad_conn user_id] Index: openacs-4/packages/evaluation/www/admin/groups/group-delete-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/group-delete-2.tcl,v diff -u -r1.10.2.1 -r1.10.2.2 --- openacs-4/packages/evaluation/www/admin/groups/group-delete-2.tcl 12 Sep 2015 11:06:06 -0000 1.10.2.1 +++ openacs-4/packages/evaluation/www/admin/groups/group-delete-2.tcl 20 May 2016 20:30:12 -0000 1.10.2.2 @@ -10,7 +10,7 @@ evaluation_group_id:naturalnum,notnull task_id:naturalnum,notnull operation - return_url + return_url:localurl } if {$operation eq "[_ evaluation.lt_Yes_I_really_want_to__2]"} { Index: openacs-4/packages/evaluation/www/admin/groups/group-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/group-delete.tcl,v diff -u -r1.9.2.1 -r1.9.2.2 --- openacs-4/packages/evaluation/www/admin/groups/group-delete.tcl 12 Sep 2015 11:06:06 -0000 1.9.2.1 +++ openacs-4/packages/evaluation/www/admin/groups/group-delete.tcl 20 May 2016 20:30:12 -0000 1.9.2.2 @@ -9,7 +9,7 @@ } { evaluation_group_id:naturalnum,notnull task_id:naturalnum,notnull - return_url:optional + return_url:localurl,optional } set page_title "[_ evaluation.Delete_Evaluation_]" Index: openacs-4/packages/evaluation/www/admin/groups/one-task.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/one-task.tcl,v diff -u -r1.13.2.1 -r1.13.2.2 --- openacs-4/packages/evaluation/www/admin/groups/one-task.tcl 12 Sep 2015 11:06:07 -0000 1.13.2.1 +++ openacs-4/packages/evaluation/www/admin/groups/one-task.tcl 20 May 2016 20:30:12 -0000 1.13.2.2 @@ -10,7 +10,7 @@ task_id:naturalnum,notnull {orderby:token,optional} {orderby_groups:optional} - {return_url ""} + {return_url:localurl ""} } -validate { group_task { if {[db_string get_number_of_members { *SQL* }] eq "1"} { Index: openacs-4/packages/evaluation/www/admin/tasks/solution-add-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/tasks/solution-add-edit.tcl,v diff -u -r1.21.2.1 -r1.21.2.2 --- openacs-4/packages/evaluation/www/admin/tasks/solution-add-edit.tcl 12 Sep 2015 11:06:08 -0000 1.21.2.1 +++ openacs-4/packages/evaluation/www/admin/tasks/solution-add-edit.tcl 20 May 2016 20:30:12 -0000 1.21.2.2 @@ -15,7 +15,7 @@ upload_file.tmpfile:tmpfile,optional {solution_mode "edit"} grade_id:naturalnum,notnull - return_url + return_url:localurl {attached_p:boolean "f"} } Index: openacs-4/packages/evaluation/www/admin/tasks/task-add-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/tasks/task-add-edit.tcl,v diff -u -r1.34.2.1 -r1.34.2.2 --- openacs-4/packages/evaluation/www/admin/tasks/task-add-edit.tcl 12 Sep 2015 11:06:08 -0000 1.34.2.1 +++ openacs-4/packages/evaluation/www/admin/tasks/task-add-edit.tcl 20 May 2016 20:30:12 -0000 1.34.2.2 @@ -13,7 +13,7 @@ upload_file:trim,optional upload_file.tmpfile:tmpfile,optional {mode "edit"} - return_url + return_url:localurl admin_groups_p:boolean,optional {add_to_more_classes_p:boolean ""} {attached_p:boolean "f"} Index: openacs-4/packages/evaluation/www/admin/tasks/task-add-to-communities.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/tasks/task-add-to-communities.tcl,v diff -u -r1.11.2.1 -r1.11.2.2 --- openacs-4/packages/evaluation/www/admin/tasks/task-add-to-communities.tcl 12 Sep 2015 11:06:08 -0000 1.11.2.1 +++ openacs-4/packages/evaluation/www/admin/tasks/task-add-to-communities.tcl 20 May 2016 20:30:12 -0000 1.11.2.2 @@ -7,7 +7,7 @@ @creation-date Jun 2004 @cvs-id $Id$ } { - return_url:notnull + return_url:localurl,notnull task_id:naturalnum,notnull communities_packages_ids:array,optional item_ids:array,optional Index: openacs-4/packages/evaluation/www/admin/tasks/task-delete-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/tasks/task-delete-2.tcl,v diff -u -r1.9.2.1 -r1.9.2.2 --- openacs-4/packages/evaluation/www/admin/tasks/task-delete-2.tcl 12 Sep 2015 11:06:08 -0000 1.9.2.1 +++ openacs-4/packages/evaluation/www/admin/tasks/task-delete-2.tcl 20 May 2016 20:30:12 -0000 1.9.2.2 @@ -10,7 +10,7 @@ task_id:naturalnum,notnull grade_id:naturalnum,notnull operation - return_url + return_url:localurl } if {$operation eq [_ evaluation.lt_Yes_I_really_want_to__3]} { Index: openacs-4/packages/evaluation/www/admin/tasks/task-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/tasks/task-delete.tcl,v diff -u -r1.8.2.1 -r1.8.2.2 --- openacs-4/packages/evaluation/www/admin/tasks/task-delete.tcl 12 Sep 2015 11:06:08 -0000 1.8.2.1 +++ openacs-4/packages/evaluation/www/admin/tasks/task-delete.tcl 20 May 2016 20:30:12 -0000 1.8.2.2 @@ -9,7 +9,7 @@ } { task_id:naturalnum,notnull grade_id:naturalnum,notnull - return_url + return_url:localurl } set page_title "[_ evaluation.Delete_Task_]" Index: openacs-4/packages/evaluation/www/admin/tasks/version-select.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/tasks/version-select.tcl,v diff -u -r1.2.10.1 -r1.2.10.2 --- openacs-4/packages/evaluation/www/admin/tasks/version-select.tcl 12 Sep 2015 11:06:09 -0000 1.2.10.1 +++ openacs-4/packages/evaluation/www/admin/tasks/version-select.tcl 20 May 2016 20:30:12 -0000 1.2.10.2 @@ -2,7 +2,7 @@ @author Anny Flores (annyflores@viaro.net) Viaro Networks (www.viaro.net) } { - {return_url ""} + {return_url:localurl ""} } set portal_id [dotlrn_community::get_portal_id -community_id [dotlrn_community::get_community_id]] Index: openacs-4/packages/evaluation/www/view/answer-add-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/view/answer-add-edit.tcl,v diff -u -r1.3.2.1 -r1.3.2.2 --- openacs-4/packages/evaluation/www/view/answer-add-edit.tcl 12 Sep 2015 11:06:09 -0000 1.3.2.1 +++ openacs-4/packages/evaluation/www/view/answer-add-edit.tcl 20 May 2016 20:30:12 -0000 1.3.2.2 @@ -13,7 +13,7 @@ item_id:naturalnum,notnull,optional upload_file:trim,optional upload_file.tmpfile:tmpfile,optional - return_url:notnull + return_url:localurl,notnull {comment ""} } -validate { late_submit -requires { task_id:integer } { Index: openacs-4/packages/evaluation/www/view/evaluation-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/view/evaluation-view.tcl,v diff -u -r1.4.2.1 -r1.4.2.2 --- openacs-4/packages/evaluation/www/view/evaluation-view.tcl 12 Sep 2015 11:06:09 -0000 1.4.2.1 +++ openacs-4/packages/evaluation/www/view/evaluation-view.tcl 20 May 2016 20:30:12 -0000 1.4.2.2 @@ -8,7 +8,7 @@ @cvs-id $Id$ } { evaluation_id:naturalnum,notnull - {return_url ""} + {return_url:localurl ""} } set page_title "[_ evaluation.View_Evaluation]" Index: openacs-4/packages/evaluation/www/view/task-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/view/task-view.tcl,v diff -u -r1.4.2.1 -r1.4.2.2 --- openacs-4/packages/evaluation/www/view/task-view.tcl 12 Sep 2015 11:06:10 -0000 1.4.2.1 +++ openacs-4/packages/evaluation/www/view/task-view.tcl 20 May 2016 20:30:12 -0000 1.4.2.2 @@ -9,7 +9,7 @@ } { grade_id:naturalnum,notnull task_id:naturalnum,notnull - {return_url ""} + {return_url:localurl ""} } set package_id [ad_conn package_id]