Index: openacs-4/packages/xowf/xowf.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/xowf.info,v diff -u -r1.12.2.75 -r1.12.2.76 --- openacs-4/packages/xowf/xowf.info 8 Feb 2022 10:05:32 -0000 1.12.2.75 +++ openacs-4/packages/xowf/xowf.info 21 Feb 2022 12:05:50 -0000 1.12.2.76 @@ -10,16 +10,16 @@ t xowf - + Gustaf Neumann XoWiki Content Flow - an XoWiki based workflow system implementing state-based behavior of wiki pages and forms 2021-09-15 WU Vienna BSD-Style 2 - - + + Index: openacs-4/packages/xowf/lib/inclass-exam.wf =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/lib/inclass-exam.wf,v diff -u -r1.1.2.91 -r1.1.2.92 --- openacs-4/packages/xowf/lib/inclass-exam.wf 31 Jan 2022 15:25:59 -0000 1.1.2.91 +++ openacs-4/packages/xowf/lib/inclass-exam.wf 21 Feb 2022 12:05:50 -0000 1.1.2.92 @@ -52,6 +52,7 @@ # - "print-participants" (for lecturers), # - "question-summary" (for lecturers), # - "delete" (for lecturers), +# - "toggle-publish-status" (for lecturers), # - "qrcode" (for lecturers) # # Gustaf Neumann, Feb 2012-2021 @@ -422,8 +423,10 @@ # # Unset the actual query return_url, since we want to use it via # property. In some cases, we have to set it explicitly from the - # property, e.g. in www-delete. + # property (like in www-delete), or we have to use the actual + # passed-in values (like in toggle_publish_status) # + set ::__passed_in_return_url [:query_parameter return_url:localurl ""] ::xo::cc unset_query_parameter return_url ######################################################################## @@ -438,6 +441,20 @@ } ######################################################################## + # web-callable method "toggle-publish-status" + # + # Toggle the status of the workflow. This is needed to avoid a bad + # interaction with [ad_return_url] as it is used in + # www-toggle-publish-status in xowiki, since the workflow definition + # unsets the actual return_url, which causes ad_return_url to use + # the URL leading to this call (m=toggle-publish-status), causing a + # redirection loop. + # + :proc www-toggle-publish-status {} { + next -return_url $::__passed_in_return_url + } + + ######################################################################## # web-callable method "print-answer-table" # # Print the answers in a tabular form. Index: openacs-4/packages/xowf/tcl/test-item-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/tcl/test-item-procs.tcl,v diff -u -r1.7.2.214 -r1.7.2.215 --- openacs-4/packages/xowf/tcl/test-item-procs.tcl 10 Feb 2022 11:50:03 -0000 1.7.2.214 +++ openacs-4/packages/xowf/tcl/test-item-procs.tcl 21 Feb 2022 12:05:50 -0000 1.7.2.215 @@ -4694,7 +4694,7 @@ # # @param obj the exam object # @param property the property name - # @param deafult default value when property is not found + # @param default default value when property is not found # set p [$obj childpage -name en:result -form inclass-exam-statistics.wf] set instance_attributes [$p instance_attributes]