Skip to content

A
acs-workflow
Commit f381d51a authored by Frank Bergmann's avatar Frank Bergmann
Browse files
Options

- Fixed ns_urlencode issue, probably because of OpenACS 5.9

parent 5e31c777
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 25 deletions
tcl/graph-procs.tcl
View file @ f381d51a
...@@ -142,14 +142,14 @@ ad_proc wf_decorate_workflow { ...@@ -142,14 +142,14 @@ ad_proc wf_decorate_workflow {
if { ![empty_string_p $selected_place_key] } { if { ![empty_string_p $selected_place_key] } {
set direction in set direction in
set place_link {} set place_link {}
set transition_link "arc-add?[export_vars -url { place_key=[ns_urlencode $selected_place_key] direction return_url}]&" set transition_link "[export_vars -base "arc-add" { {place_key $selected_place_key} direction return_url}]&"
foreach loop_transition_key $workflow(arcs,place,$selected_place_key,in) { foreach loop_transition_key $workflow(arcs,place,$selected_place_key,in) {
lappend nolink "transition,$loop_transition_key" lappend nolink "transition,$loop_transition_key"
} }
} else { } else {
set direction out set direction out
set transition_link {} set transition_link {}
set place_link "arc-add?[export_vars -url { transition_key=[ns_urlencode $selected_transition_key] direction return_url}]&" set place_link "[export_vars -base "arc-add" { {transition_key $selected_transition_key} direction return_url}]&"
foreach loop_place_key $workflow(arcs,transition,$selected_transition_key,out) { foreach loop_place_key $workflow(arcs,transition,$selected_transition_key,out) {
lappend nolink "place,$loop_place_key" lappend nolink "place,$loop_place_key"
} }
...@@ -159,14 +159,14 @@ ad_proc wf_decorate_workflow { ...@@ -159,14 +159,14 @@ ad_proc wf_decorate_workflow {
if { ![empty_string_p $selected_place_key] } { if { ![empty_string_p $selected_place_key] } {
set direction in set direction in
set place_link {} set place_link {}
set transition_link "arc-delete?[export_vars -url { place_key=[ns_urlencode $selected_place_key] direction return_url}]&" set transition_link "[export_vars -base "arc-delete" { {place_key $selected_place_key} direction return_url}]&"
foreach loop_transition_key $workflow(arcs,place,$selected_place_key,in) { foreach loop_transition_key $workflow(arcs,place,$selected_place_key,in) {
lappend onlylink "transition,$loop_transition_key" lappend onlylink "transition,$loop_transition_key"
} }
} else { } else {
set direction out set direction out
set transition_link {} set transition_link {}
set place_link "arc-delete?[export_vars -url { transition_key=[ns_urlencode $selected_transition_key] direction return_url}]&" set place_link "[export_vars -base "arc-delete" { {transition_key $selected_transition_key} direction return_url}]&"
foreach loop_place_key $workflow(arcs,transition,$selected_transition_key,out) { foreach loop_place_key $workflow(arcs,transition,$selected_transition_key,out) {
lappend onlylink "place,$loop_place_key" lappend onlylink "place,$loop_place_key"
} }
...@@ -202,12 +202,6 @@ ad_proc wf_decorate_workflow { ...@@ -202,12 +202,6 @@ ad_proc wf_decorate_workflow {
foreach type { transition place } { foreach type { transition place } {
foreach key $workflow(${type}s) { foreach key $workflow(${type}s) {
if { [empty_string_p $onlylink] } { if { [empty_string_p $onlylink] } {
# set workflow($type,$key,url) [ad_decode \
# [set ${type}_link] \
# "" "" \
# "[set ${type}_link][export_vars -url { workflow_key ${type}_key=[ns_urlencode $key]}]"]
eval "set ${type}_key [ns_urlencode $key]" eval "set ${type}_key [ns_urlencode $key]"
set par [list] set par [list]
lappend par workflow_key "${type}_key" lappend par workflow_key "${type}_key"
......
www/admin/define-place-info.tcl
View file @ f381d51a
...@@ -46,18 +46,18 @@ template::multirow create producing_transitions transition_key transition_name u ...@@ -46,18 +46,18 @@ template::multirow create producing_transitions transition_key transition_name u
set direction "out" set direction "out"
foreach loop_transition_key $workflow(arcs,place,$place_key,out) { foreach loop_transition_key $workflow(arcs,place,$place_key,out) {
set url "define?[export_vars -url { workflow_key transition_key=[ns_urlencode $loop_transition_key] format}]" set url [export_vars -base "define" { workflow_key {transition_key $loop_transition_key} format}]
if { $modifiable_p } { if { $modifiable_p } {
set arc_delete_url "arc-delete?[export_vars -url { workflow_key transition_key=[ns_urlencode $loop_transition_key] place_key direction return_url}]" set arc_delete_url [export_vars -base "arc-delete" { workflow_key {transition_key $loop_transition_key} place_key direction return_url}]
} else { } else {
set arc_delete_url "" set arc_delete_url ""
} }
set guard_pretty [ad_decode $workflow(arc,$loop_transition_key,$place_key,out,guard_description) \ set guard_pretty [ad_decode $workflow(arc,$loop_transition_key,$place_key,out,guard_description) \
"" $workflow(arc,$loop_transition_key,$place_key,out,guard_callback) \ "" $workflow(arc,$loop_transition_key,$place_key,out,guard_callback) \
$workflow(arc,$loop_transition_key,$place_key,out,guard_description)] $workflow(arc,$loop_transition_key,$place_key,out,guard_description)]
set guard_edit_url "arc-edit?[export_vars -url { workflow_key transition_key=[ns_urlencode $loop_transition_key] place_key direction return_url}]" set guard_edit_url [export_vars -base "arc-edit" { workflow_key {transition_key $loop_transition_key} place_key direction return_url}]
set guard_delete_url "arc-edit-2?[export_vars -url { workflow_key transition_key=[ns_urlencode $loop_transition_key] place_key direction return_url}]&guard_callback=&guard_custom_arg=&guard_description=" set guard_delete_url [export_vars -base "arc-edit-2" { workflow_key {transition_key $loop_transition_key} place_key direction return_url {guard_callback ""} {guard_custom_arg ""} {guard_description ""}}]
set guard_add_url "arc-edit?[export_vars -url { workflow_key transition_key=[ns_urlencode $loop_transition_key] place_key direction return_url}]" set guard_add_url [export_vars -base "arc-edit" { workflow_key {transition_key $loop_transition_key} place_key direction return_url}]
template::multirow append producing_transitions $loop_transition_key \ template::multirow append producing_transitions $loop_transition_key \
$workflow(transition,$loop_transition_key,transition_name) $url $arc_delete_url \ $workflow(transition,$loop_transition_key,transition_name) $url $arc_delete_url \
...@@ -70,9 +70,9 @@ template::multirow create consuming_transitions transition_key transition_name u ...@@ -70,9 +70,9 @@ template::multirow create consuming_transitions transition_key transition_name u
set direction "in" set direction "in"
foreach loop_transition_key $workflow(arcs,place,$place_key,in) { foreach loop_transition_key $workflow(arcs,place,$place_key,in) {
set url "define?[export_vars -url { workflow_key transition_key=[ns_urlencode $loop_transition_key] format}]" set url [export_vars -base "define" { workflow_key {transition_key $loop_transition_key} format}]
if { $modifiable_p } { if { $modifiable_p } {
set arc_delete_url "arc-delete?[export_vars -url { workflow_key transition_key=[ns_urlencode $loop_transition_key] place_key direction return_url}]" set arc_delete_url [export_vars -base "arc-delete" {workflow_key {transition_key $loop_transition_key} place_key direction return_url}]
} else { } else {
set arc_delete_url "" set arc_delete_url ""
} }
......
www/admin/define-transition-info.tcl
View file @ f381d51a
...@@ -48,9 +48,9 @@ template::multirow create input_places place_key place_name url arc_delete_url ...@@ -48,9 +48,9 @@ template::multirow create input_places place_key place_name url arc_delete_url
set direction "in" set direction "in"
foreach loop_place_key $workflow(arcs,transition,$transition_key,in) { foreach loop_place_key $workflow(arcs,transition,$transition_key,in) {
set url "define?[export_vars -url { workflow_key place_key=[ns_urlencode $loop_place_key] format}]" set url [export_vars -base "define" { workflow_key {place_key $loop_place_key} format}]
if { $modifiable_p } { if { $modifiable_p } {
set arc_delete_url "arc-delete?[export_vars -url {workflow_key transition_key place_key=[ns_urlencode $loop_place_key] direction return_url}]" set arc_delete_url [export_vars -base "arc-delete" {workflow_key transition_key {place_key $loop_place_key} direction return_url}]
} else { } else {
set arc_delete_url "" set arc_delete_url ""
} }
...@@ -65,19 +65,22 @@ template::multirow create output_places place_key place_name url arc_delete_url ...@@ -65,19 +65,22 @@ template::multirow create output_places place_key place_name url arc_delete_url
set direction "out" set direction "out"
foreach loop_place_key $workflow(arcs,transition,$transition_key,out) { foreach loop_place_key $workflow(arcs,transition,$transition_key,out) {
set url "define?[export_vars -url { workflow_key place_key=[ns_urlencode $loop_place_key] format}]" set url [export_vars -base "define" {workflow_key {place_key $loop_place_key} format}]
if { $modifiable_p } { if { $modifiable_p } {
# ToDo: test: palace_key=[...] set arc_delete_url [export_vars -base "arc-delete" { workflow_key transition_key {place_key $loop_place_key} direction return_url}]
set arc_delete_url "arc-delete?[export_vars -url { workflow_key transition_key place_key=[ns_urlencode $loop_place_key] direction return_url}]"
} else { } else {
set arc_delete_url "" set arc_delete_url ""
} }
set guard_pretty [ad_decode $workflow(arc,$transition_key,$loop_place_key,out,guard_description) \ set guard_pretty [ad_decode $workflow(arc,$transition_key,$loop_place_key,out,guard_description) \
"" $workflow(arc,$transition_key,$loop_place_key,out,guard_callback) \ "" $workflow(arc,$transition_key,$loop_place_key,out,guard_callback) \
$workflow(arc,$transition_key,$loop_place_key,out,guard_description)] $workflow(arc,$transition_key,$loop_place_key,out,guard_description)]
set guard_edit_url "arc-edit?[export_vars -url { workflow_key transition_key place_key=[ns_urlencode $loop_place_key] direction return_url}]"
set guard_delete_url "arc-edit-2?[export_vars -url { workflow_key transition_key place_key=[ns_urlencode $loop_place_key] direction return_url}]&guard_callback=&guard_custom_arg=&guard_description=" set guard_edit_url [export_vars -base "arc-edit" {workflow_key transition_key {place_key $loop_place_key} direction return_url}]
set guard_add_url "arc-edit?[export_vars -url { workflow_key transition_key place_key=[ns_urlencode $loop_place_key] direction return_url}]"
set guard_delete_url [export_vars -base "arc-edit-2" {workflow_key transition_key {place_key $loop_place_key} direction return_url {guard_callback ""} {guard_custom_arg ""} {guard_description ""}}]
set guard_add_url [export_vars -base "arc-edit" {workflow_key transition_key {place_key $loop_place_key} direction return_url}]
template::multirow append output_places $loop_place_key $workflow(place,$loop_place_key,place_name) $url $arc_delete_url \ template::multirow append output_places $loop_place_key $workflow(place,$loop_place_key,place_name) $url $arc_delete_url \
$guard_pretty $guard_edit_url $guard_delete_url $guard_add_url $guard_pretty $guard_edit_url $guard_delete_url $guard_add_url
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment