Commit 9f598355 authored by Frank Bergmann's avatar Frank Bergmann

- GUI fixed

parent 60d5cc15
......@@ -35,9 +35,9 @@
</td>
<if @roles.user_select_widget@ not nil>
<form action="static-assignment-add" method="post">
@roles.add_export_vars@
@roles.add_export_vars;noquote@
<td>
@roles.user_select_widget@
@roles.user_select_widget;noquote@
<input type="submit" value="Add">
</td>
</form>
......
......@@ -4,13 +4,13 @@
<if @task_list:rowcount@ ne 0>
<table cellspacing="0" cellpadding="0" border="0">
<tr><td bgcolor="#cccccc">
<tr><td>
<table width="100%" cellspacing="1" cellpadding="4" border="0">
<tr bgcolor="#ffffe4">
<th>To do</th>
<th>On what</th>
<th>As part of</th>
<tr class=rowtitle>
<th><%= [lang::message::lookup "" acs-workflow.To_Do "To do"] %></th>
<th><%= [lang::message::lookup "" acs-workflow.On_what "On what?"] %></th>
<th><%= [lang::message::lookup "" acs-workflow.As_part_of "Part of"] %></th>
<if @type@ eq "own">
<th>Started</th>
......@@ -22,7 +22,7 @@
<multiple name="task_list">
<tr valign="middle" bgcolor="#eeeeee">
<td><a href="@package_url@@task_list.task_url@">@task_list.task_name@</a>
<td><a href="@package_url;noquote@@task_list.task_url@">@task_list.task_name@</a>
<if @task_list.state@ eq "started">
<if @task_list.holding_user@ not nil>
......
......@@ -3,7 +3,6 @@ ad_page_contract {} {
task_list
}
if { ![info exist date_format] || [empty_string_p $date_format] } {
set date_format "Mon fmDDfm, YYYY HH24:MI:SS"
}
......@@ -19,6 +18,9 @@ if { ![info exists package_url] || [empty_string_p $package_url] } {
set package_url [ad_conn package_url]
}
# DRB: setting return_url to point explicitly at ourselves will cause
# custom workflow action panels to return to the right place whether
# they're called from the workflow UI or a custom package UI.
......@@ -88,5 +90,5 @@ from [join $from ",\n "]
where [join $where "\n and "]"
db_multirow task_list started_tasks_select $sql {
set task_url "task?[export_vars -url {task_id return_url}]"
set task_url "[export_vars -base "task" {task_id return_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