Index: openacs-4/packages/curriculum/lib/user-curriculums.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum/lib/user-curriculums.adp,v diff -u -r1.6 -r1.7 --- openacs-4/packages/curriculum/lib/user-curriculums.adp 13 Jun 2003 11:44:33 -0000 1.6 +++ openacs-4/packages/curriculum/lib/user-curriculums.adp 14 Jun 2003 16:29:23 -0000 1.7 @@ -1,10 +1,10 @@ <if @elements:rowcount@ not nil> <p> [ - <a href="@url@start-over">Refresh all curriculums</a> + <a href="@url@start-over?@return_url_export@">Refresh all curriculums</a> <if @logged_in_p@> | - <a href="@url@remove-from-bar">Remove all curriculums</a> + <a href="@url@remove-from-bar?@return_url_export@">Remove all curriculums</a> </if> ] </p> @@ -31,19 +31,19 @@ </td> <td width="15%"> <if @elements.completed_p@> - <a href="@url@add-to-bar?curriculum_id=@elements.curriculum_id@&refresh_p=1">Retake</a> + <a href="@url@add-to-bar?curriculum_id=@elements.curriculum_id@&refresh_p=1&@return_url_export@">Retake</a> </if> <else> - <a href="@url@add-to-bar?curriculum_id=@elements.curriculum_id@">Resume</a> + <a href="@url@add-to-bar?curriculum_id=@elements.curriculum_id@&@return_url_export@">Resume</a> </else> </if> <else> <if @elements.completed_p@>Completed</if><else>Ongoing</else> </td> <td width="15%"> - <a href="@url@start-over?curriculum_id=@elements.curriculum_id@">Refresh</a> + <a href="@url@start-over?curriculum_id=@elements.curriculum_id@&@return_url_export@">Refresh</a> | - <a href="@url@remove-from-bar?curriculum_id=@elements.curriculum_id@"> + <a href="@url@remove-from-bar?curriculum_id=@elements.curriculum_id@&@return_url_export@"> <if @elements.completed_p@>Remove</if><else>Drop</else> </a> </else> @@ -52,7 +52,7 @@ <if @elements.completed_p@>Completed</if><else>Ongoing</else> </td> <td width="15%"> - <a href="@url@start-over?curriculum_id=@elements.curriculum_id@">Refresh</a> + <a href="@url@start-over?curriculum_id=@elements.curriculum_id@&@return_url_export@">Refresh</a> </else> </td> </tr> Index: openacs-4/packages/curriculum/lib/user-curriculums.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum/lib/user-curriculums.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/curriculum/lib/user-curriculums.tcl 13 Jun 2003 11:44:33 -0000 1.3 +++ openacs-4/packages/curriculum/lib/user-curriculums.tcl 14 Jun 2003 16:29:24 -0000 1.4 @@ -25,4 +25,7 @@ # into the dotLRN portlet. set url [lindex [site_node::get_url_from_object_id -object_id $package_id] 0] +set return_url [ad_return_url] +set return_url_export [export_vars -url return_url] + ad_return_template