Skip to content

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

- fixed Workflow problems with changed ADP tags

parent 860aa7b0
Hide whitespace changes
Inline Side-by-side
Showing with 70 additions and 29 deletions
acs-workflow.info
View file @ 6c8a11ab
<?xml version="1.0"?>
<!-- Generated by the OpenACS Package Manager -->
<package key="acs-workflow" url="http://www.arsdigita.com/acs-repository/apm/packages/acs-workflow/" type="apm_service">
<package-name>Workflow Service (deprecated)</package-name>
<pretty-plural>Workflows Services (deprecated)</pretty-plural>
<package key="acs-workflow" url="http://www.arsdigita.com/acs-repository/apm/packages/acs-workflow/" type="apm_application">
<package-name>Workflow Service (Petri Nets)</package-name>
<pretty-plural>Workflows Services (Petri Nets)</pretty-plural>
<initial-install-p>f</initial-install-p>
<singleton-p>t</singleton-p>
<auto-mount>workflow</auto-mount>
<version name="4.5" url="http://www.openacs.org/repository/download/apm/acs-workflow-4.5.apm">
<database-support>
......@@ -15,6 +16,7 @@
<owner url="http://www.pinds.com/">Lars Pind</owner>
<owner url="mailto:k2pts@yahoo.com">Neophytos Demetriou</owner>
<owner url="mailto:danw@rtp.ericsson.se">Daniel Wickstrom</owner>
<owner url="mailto:frank.bergmann@project-open.com">Frank Bergmann</owner>
<summary>Provides generic workflow management features to all ACS objects.</summary>
<release-date>2002-05-15</release-date>
<vendor url="http://www.openacs.org/">OpenACS</vendor>
......
www/admin/define-place-info.adp
View file @ 6c8a11ab
......@@ -17,7 +17,7 @@
(<a href="@place.delete_url@">delete place</a>)
</if>
<else>
&nbsp;
(can't delete place)
</else>
</td>
</tr>
......@@ -76,9 +76,15 @@
<if @place.arc_add_url@ not nil>
(<a href="@place.arc_add_url@">add arc</a>)
</if>
<else>
(can't add arc)
</else>
<if @place.arc_delete_url@ not nil>
(<a href="@place.arc_delete_url@">delete arc</a>)
</if>
<else>
(can't delete arc)
</else>
&nbsp;
</td>
</tr>
......
www/admin/init-postgresql.xql
View file @ 6c8a11ab
......@@ -6,7 +6,33 @@
<fullquery name="object">
<querytext>
select object_id, acs_object__name(object_id) as name from acs_objects order by name
select *
from
(select
object_id,
object_type || ' - ' || acs_object__name(object_id) as name
from
acs_objects
where object_type not in (
'im_biz_object_member', 'apm_package_version',
'content_revision', 'membership_rel', 'apm_parameter',
'im_cost', 'apm_parameter_value',
'relationship', 'im_office', 'acs_sc_msg_type',
'acs_sc_contract', 'acs_sc_implementation',
'site_node', 'cr_item_rel', 'composition_rel',
'user_portrait_rel', 'content_module', 'acs_sc_operation',
'acs_object', 'content_folder', 'rel_segment',
'application_group', 'apm_package', 'content_item',
'acs_reference_repository', 'im_menu',
'apm_service', 'authority', 'group',
'content_template', 'acs_mail_body', 'acs_mail_link',
'journal_entry'
)
) o
where
name != ''
order by
name
</querytext>
</fullquery>
......
www/admin/static-assignments-table-postgresql.xql
View file @ 6c8a11ab
......@@ -34,14 +34,16 @@
select p.party_id as sel_party_id,
acs_object__name(p.party_id) as sel_name,
p.email as sel_email
from parties p
from parties p
where p.party_id not in
(select ca.party_id
from wf_context_assignments ca
where ca.workflow_key = :workflow_key
and ca.context_key = :context_key
and ca.role_key = :role_key)
and ca.role_key = :role_key
)
and p.party_id in (select group_id from groups)
</querytext>
</fullquery>
......
www/admin/static-assignments-table.tcl
View file @ 6c8a11ab
......@@ -44,15 +44,17 @@ db_multirow roles roles {
acs_object.name(p.party_id) as sel_name,
p.email as sel_email
from parties p
where p.party_id not in
(select ca.party_id
from wf_context_assignments ca
where ca.workflow_key = :workflow_key
and ca.context_key = :context_key
and ca.role_key = :role_key)
where p.party_id not in (
select ca.party_id
from wf_context_assignments ca
where ca.workflow_key = :workflow_key
and ca.context_key = :context_key
and ca.role_key = :role_key
)
and p.party_id in (select group_id from groups)
} {
incr counter
append user_select_widget "<option value=\"$sel_party_id\">$sel_name[ad_decode $sel_email "" "" " ($sel_email)"]</option>"
append user_select_widget "<option value=\"$sel_party_id\">$sel_name[ad_decode $sel_email "" "" " ($sel_email)"]</option>\n"
}
append user_select_widget "</select>"
if { $counter == 0 } {
......
www/admin/task-assignment.adp
View file @ 6c8a11ab
......@@ -48,7 +48,7 @@ The user performing the task <strong>@transition_name@</strong> will be asked to
<td colspan="2">
<if @to_be_assigned_by_this:rowcount@ gt 0>
<form action="@assign_url@">
@assign_export_vars@
@assign_export_vars;noquote@
Assign this:
<select name="role_key">
<multiple name="to_be_assigned_by_this">
......
www/admin/task-attributes.adp
View file @ 6c8a11ab
......@@ -58,7 +58,7 @@
<td>&nbsp;</td>
<td colspan="2">
<form action="@add_url@" method="post">
@add_export_vars@
@add_export_vars;noquote@
Set this:
<select name="attribute_id">
<multiple name="attributes_not_set">
......
www/admin/task-panel-add.adp
View file @ 6c8a11ab
<master>
<property name="title">Add panel</property>
<property name="focus">panel.header</property>
<property name="context">@context;noquote@</property>
<h2>Add Panel</h2>
@context@
<hr>
<form action="task-panel-add-2" name="panel" method="post">
@export_vars;noquote@
......
www/admin/task-panel-edit.adp
View file @ 6c8a11ab
......@@ -4,7 +4,7 @@
<property name="focus">panel.header</property>
<form action="task-panel-edit-2" name="panel" method="post">
@panel.export_vars@
@panel.export_vars;noquote@
<table>
<tr>
......
www/admin/transition-panels-table.tcl
View file @ 6c8a11ab
......@@ -54,7 +54,7 @@ db_multirow panels panels {
set panel_add_url "task-panel-add?[export_vars -url {workflow_key transition_key context_key return_url}]"
set panel_edit_url "task-panel-edit?[export_vars -url {sort_order workflow_key transition_key context_key return_url}]"
set panel_delete_url [ad_quotehtml "javascript:if(confirm('Are you sure you want to delete this panel?'))location.href='task-panel-delete?[export_vars -url {sort_order workflow_key transition_key context_key return_url}]'"]
set panel_delete_url "task-panel-delete?[export_vars -url {sort_order workflow_key transition_key context_key return_url}]"
set transition_edit_url "task-edit?[export_vars -url {workflow_key transition_key return_url}]"
set panel_no $panel_count
......
www/admin/workflow-display.adp
View file @ 6c8a11ab
......@@ -17,5 +17,5 @@
</if>
<else>
@display@
@display;noquote@
</else>
www/admin/workflow-summary.adp
View file @ 6c8a11ab
......@@ -6,7 +6,7 @@
<if @workflow_img_tag@ not nil>
<center>
@workflow_img_tag@
@workflow_img_tag;noquote@
</center>
</if>
......
www/case-assignment-set.adp
View file @ 6c8a11ab
......@@ -11,7 +11,7 @@
</tr>
<tr>
<th align="right">Assignments</th>
<td>@notification_chunk;noquote@</td>
<td>@widget;noquote@</td>
</tr>
<tr>
<td>&nbsp;</td>
......
www/case-state-graph.adp
View file @ 6c8a11ab
@workflow_img_tag@
@workflow_img_tag;noquote@
www/index.tcl
View file @ 6c8a11ab
......@@ -9,6 +9,7 @@ ad_page_contract {
admin_p
}
set user_id [ad_maybe_redirect_for_registration]
set admin_p [ad_permission_p [ad_conn package_id] "admin"]
set context [list]
......
www/task-action.adp
View file @ 6c8a11ab
......@@ -2,7 +2,7 @@
<if @task.state@ eq enabled>
<if @task.this_user_is_assigned_p@ eq 1>
<form action="task" method="post">
@export_form_vars@
@export_form_vars;noquote@
<table>
<tr><th align="right">Action:</th>
<td><input type="submit" name="action.start" value="Start task" /></td>
......@@ -57,20 +57,20 @@
<if @task.state@ eq started>
<if @task.this_user_is_assigned_p@ eq 1>
<form action="task" method="post">
@export_form_vars@
@export_form_vars;noquote@
<table>
<multiple name="task_roles_to_assign">
<tr>
<th align="right">Assign @task_roles_to_assign.role_name@</th>
<td>@task_roles_to_assign.assignment_widget@</td>
<td>@task_roles_to_assign.assignment_widget;noquote@</td>
</tr>
</multiple>
<multiple name="task_attributes_to_set">
<tr>
<th align="right">@task_attributes_to_set.pretty_name@</th>
<td>@task_attributes_to_set.attribute_widget@</td>
<td>@task_attributes_to_set.attribute_widget;noquote@</td>
</tr>
</multiple>
......
www/task.adp
View file @ 6c8a11ab
......@@ -22,6 +22,7 @@
<multiple name="panels">
<td bgcolor="@panels.bgcolor@" valign="top">
<!-- @panels.template_url@ -->
<include src="@panels.template_url;noquote@" &="task" &="task_attributes_to_set" &="task_assigned_users" &="task_roles_to_assign" &="export_form_vars" &="return_url">
</td>
</multiple>
......
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