Index: openacs-4/contrib/obsolete-packages/acs-workflow/acs-workflow.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/acs-workflow.info,v
diff -u -r1.12 -r1.13
--- openacs-4/contrib/obsolete-packages/acs-workflow/acs-workflow.info 3 Jan 2002 16:24:11 -0000 1.12
+++ openacs-4/contrib/obsolete-packages/acs-workflow/acs-workflow.info 12 Feb 2002 01:35:16 -0000 1.13
@@ -33,6 +33,7 @@
<file type="data_model" db_type="oracle" path="sql/oracle/sample-expenses-create.sql"/>
<file type="data_model" db_type="oracle" path="sql/oracle/sample-expenses-drop.sql"/>
<file type="data_model" db_type="oracle" path="sql/oracle/test/workflow-case-package-test.sql"/>
+ <file type="data_model_upgrade" db_type="oracle" path="sql/oracle/upgrade-4.0-4.0.1.sql"/>
<file type="data_model_upgrade" db_type="oracle" path="sql/oracle/upgrade-4.1.1-4.3.sql"/>
<file type="data_model_upgrade" db_type="oracle" path="sql/oracle/upgrade/upgrade-4.0-4.0.1.sql"/>
<file type="data_model_upgrade" db_type="oracle" path="sql/oracle/upgrade/upgrade-4.0.1-4.1b.sql"/>
@@ -75,29 +76,27 @@
<file type="query_file" db_type="postgresql" path="tcl/display-procs-postgresql.xql"/>
<file type="tcl_procs" path="tcl/display-procs.tcl"/>
<file type="query_file" path="tcl/display-procs.xql"/>
+ <file type="tcl_procs" path="tcl/expenses-procs.tcl"/>
<file type="tcl_init" path="tcl/graph-init.tcl"/>
<file type="tcl_procs" path="tcl/graph-procs.tcl"/>
<file type="query_file" path="tcl/graph-procs.xql"/>
<file type="tcl_procs" path="tcl/wizard-procs.tcl"/>
<file type="tcl_init" path="tcl/workflow-init.tcl"/>
<file type="query_file" db_type="oracle" path="tcl/workflow-procs-oracle.xql"/>
- <file db_type="oracle" path="tcl/workflow-procs-oracle.xql~"/>
<file type="query_file" db_type="postgresql" path="tcl/workflow-procs-postgresql.xql"/>
<file type="tcl_procs" path="tcl/workflow-procs.tcl"/>
- <file path="tcl/workflow-procs.tcl~"/>
<file type="query_file" path="tcl/workflow-procs.xql"/>
- <file type="content_page" path="www/#task.adp#"/>
<file type="query_file" db_type="oracle" path="www/active-tasks-oracle.xql"/>
<file type="query_file" db_type="postgresql" path="www/active-tasks-postgresql.xql"/>
<file path="www/active-tasks.adp"/>
<file type="tcl_util" path="www/active-tasks.tcl"/>
- <file type="content_page" db_type="oracle" path="www/admin/#cases-oracle.xql#"/>
- <file type="content_page" db_type="postgresql" path="www/admin/#static-assignments-table-postgresql.xql#"/>
<file type="content_page" path="www/admin/arc-add.tcl"/>
<file type="query_file" path="www/admin/arc-add.xql"/>
<file type="content_page" path="www/admin/arc-delete.tcl"/>
+ <file type="query_file" path="www/admin/arc-delete.xql"/>
<file type="content_page" path="www/admin/arc-edit-2.tcl"/>
<file type="query_file" path="www/admin/arc-edit-2.xql"/>
+ <file type="query_file" db_type="oracle" path="www/admin/arc-edit-oracle.xql"/>
<file type="query_file" db_type="postgresql" path="www/admin/arc-edit-postgresql.xql"/>
<file type="content_page" path="www/admin/arc-edit.adp"/>
<file type="content_page" path="www/admin/arc-edit.tcl"/>
@@ -110,14 +109,12 @@
<file type="query_file" db_type="oracle" path="www/admin/attribute-add-2-oracle.xql"/>
<file type="query_file" db_type="postgresql" path="www/admin/attribute-add-2-postgresql.xql"/>
<file type="content_page" path="www/admin/attribute-add-2.tcl"/>
- <file type="content_page" path="www/admin/attribute-add-2.tcl~"/>
<file type="content_page" path="www/admin/attribute-add.adp"/>
<file type="content_page" path="www/admin/attribute-add.tcl"/>
<file type="query_file" path="www/admin/attribute-add.xql"/>
<file type="query_file" db_type="oracle" path="www/admin/attribute-delete-oracle.xql"/>
<file type="query_file" db_type="postgresql" path="www/admin/attribute-delete-postgresql.xql"/>
<file type="content_page" path="www/admin/attribute-delete.tcl"/>
- <file type="content_page" path="www/admin/attribute-delete.tcl~"/>
<file type="query_file" path="www/admin/attribute-delete.xql"/>
<file path="www/admin/attributes-table.adp"/>
<file type="tcl_util" path="www/admin/attributes-table.tcl"/>
@@ -215,12 +212,16 @@
<file type="query_file" path="www/admin/static-assignment-add.xql"/>
<file type="content_page" path="www/admin/static-assignment-delete.tcl"/>
<file type="query_file" path="www/admin/static-assignment-delete.xql"/>
+ <file type="query_file" db_type="oracle" path="www/admin/static-assignments-oracle.xql"/>
+ <file type="query_file" db_type="postgresql" path="www/admin/static-assignments-postgresql.xql"/>
<file type="query_file" db_type="oracle" path="www/admin/static-assignments-table-oracle.xql"/>
<file type="query_file" db_type="postgresql" path="www/admin/static-assignments-table-postgresql.xql"/>
<file path="www/admin/static-assignments-table.adp"/>
<file type="tcl_util" path="www/admin/static-assignments-table.tcl"/>
+ <file type="content_page" path="www/admin/static-assignments.adp"/>
+ <file type="content_page" path="www/admin/static-assignments.tcl"/>
+ <file type="query_file" path="www/admin/static-assignments.xql"/>
<file type="content_page" path="www/admin/task-actions-2.tcl"/>
- <file type="content_page" path="www/admin/task-actions-2.tcl~"/>
<file type="query_file" path="www/admin/task-actions-2.xql"/>
<file type="content_page" path="www/admin/task-actions.adp"/>
<file type="content_page" path="www/admin/task-actions.tcl"/>
@@ -248,6 +249,7 @@
<file type="content_page" path="www/admin/task-attributes.tcl"/>
<file type="query_file" path="www/admin/task-attributes.xql"/>
<file type="content_page" path="www/admin/task-delete.tcl"/>
+ <file type="query_file" path="www/admin/task-delete.xql"/>
<file type="content_page" path="www/admin/task-edit-2.tcl"/>
<file type="query_file" path="www/admin/task-edit-2.xql"/>
<file type="content_page" path="www/admin/task-edit.adp"/>
@@ -276,20 +278,17 @@
<file type="query_file" db_type="oracle" path="www/admin/transition-panels-table-oracle.xql"/>
<file path="www/admin/transition-panels-table.adp"/>
<file type="tcl_util" path="www/admin/transition-panels-table.tcl"/>
- <file type="content_page" path="www/admin/transition-panels-table.tcl~"/>
<file type="query_file" path="www/admin/transition-panels-table.xql"/>
<file type="query_file" db_type="oracle" path="www/admin/transitions-table-oracle.xql"/>
<file path="www/admin/transitions-table.adp"/>
<file type="tcl_util" path="www/admin/transitions-table.tcl"/>
- <file type="content_page" path="www/admin/transitions-table.tcl~"/>
<file type="query_file" path="www/admin/transitions-table.xql"/>
<file type="query_file" db_type="oracle" path="www/admin/unassigned-tasks-oracle.xql"/>
<file type="query_file" db_type="postgresql" path="www/admin/unassigned-tasks-postgresql.xql"/>
<file type="content_page" path="www/admin/unassigned-tasks.adp"/>
<file type="content_page" path="www/admin/unassigned-tasks.tcl"/>
<file type="query_file" path="www/admin/unassigned-tasks.xql"/>
<file path="www/admin/up.gif"/>
- <file type="content_page" path="www/admin/wizard/#create.xql#"/>
<file type="content_page" path="www/admin/wizard/assignments.adp"/>
<file type="content_page" path="www/admin/wizard/assignments.tcl"/>
<file type="query_file" db_type="oracle" path="www/admin/wizard/create-oracle.xql"/>
@@ -362,13 +361,23 @@
<file type="content_page" path="www/admin/workflow.adp"/>
<file type="content_page" path="www/admin/workflow.tcl"/>
<file type="query_file" path="www/admin/workflow.xql"/>
+ <file type="query_file" db_type="postgresql" path="www/assign-add-postgresql.xql"/>
+ <file type="query_file" db_type="oracle" path="www/assign-yourself-oracle.xql"/>
+ <file type="query_file" db_type="postgresql" path="www/assign-yourself-postgresql.xql"/>
<file type="content_page" path="www/assign-yourself.tcl"/>
+ <file type="query_file" path="www/assign-yourself.xql"/>
+ <file type="query_file" db_type="oracle" path="www/assignee-add-2-oracle.xql"/>
+ <file type="query_file" db_type="postgresql" path="www/assignee-add-2-postgresql.xql"/>
<file type="content_page" path="www/assignee-add-2.tcl"/>
+ <file type="query_file" path="www/assignee-add-2.xql"/>
<file type="query_file" db_type="oracle" path="www/assignee-add-oracle.xql"/>
<file type="query_file" db_type="postgresql" path="www/assignee-add-postgresql.xql"/>
<file type="content_page" path="www/assignee-add.adp"/>
<file type="content_page" path="www/assignee-add.tcl"/>
+ <file type="query_file" db_type="oracle" path="www/assignee-remove-2-oracle.xql"/>
+ <file type="query_file" db_type="postgresql" path="www/assignee-remove-2-postgresql.xql"/>
<file type="content_page" path="www/assignee-remove-2.tcl"/>
+ <file type="query_file" path="www/assignee-remove-2.xql"/>
<file type="tcl_util" path="www/case-assignment-remove-2.tcl"/>
<file type="tcl_util" path="www/case-assignment-set-2.tcl"/>
<file type="query_file" db_type="oracle" path="www/case-assignment-set-oracle.xql"/>
@@ -412,6 +421,7 @@
<file type="query_file" path="www/case-state-graph.xql"/>
<file type="content_page" path="www/case.adp"/>
<file type="content_page" path="www/case.tcl"/>
+ <file type="query_file" path="www/case.xql"/>
<file type="content_page" path="www/comment-add-2.tcl"/>
<file type="query_file" db_type="oracle" path="www/comment-add-oracle.xql"/>
<file type="query_file" db_type="postgresql" path="www/comment-add-postgresql.xql"/>
@@ -490,14 +500,14 @@
<file type="content_page" path="www/workflow.tcl"/>
</files>
<parameters>
- <parameter datatype="string" min_n_values="1" max_n_values="1" name="graphviz_dot_path" default="/usr/local/bin/dot" description="Full path and filename for the AT and T GraphViz dot binary. Leave this blank if you don't have GraphViz installed."/>
- <parameter datatype="string" min_n_values="1" max_n_values="1" name="tmp_path" default="/var/tmp" description="Path to a directory where we can store temporary files. It needs to be writable by the user that the webserver is running as."/>
- <parameter datatype="string" min_n_values="1" max_n_values="1" name="transition_font_name" default="arialb" description="The name of the font to use for transitions when displaying a process graph. This is the name of a .ttf file available to your GraphViz installation." section_name="fonts"/>
- <parameter datatype="string" min_n_values="1" max_n_values="1" name="place_font_name" default="arial" description="The name of the font to use for places when displaying a process graph. This is the name of a .ttf file available to your GraphViz installation." section_name="fonts"/>
- <parameter datatype="string" min_n_values="1" max_n_values="1" name="guard_font_name" default="arial" description="The name of the font to use for guards when displaying a process graph. This is the name of a .ttf file available to your GraphViz installation." section_name="fonts"/>
- <parameter datatype="number" min_n_values="1" max_n_values="1" name="transition_font_size" default="14" description="The size of the font to use for transitions when displaying a process graph." section_name="fonts"/>
- <parameter datatype="number" min_n_values="1" max_n_values="1" name="place_font_size" default="10" description="The size of the font to use for places when displaying a process graph." section_name="fonts"/>
<parameter datatype="number" min_n_values="1" max_n_values="1" name="guard_font_size" default="10" description="The size of the font to use for guards when displaying a process graph." section_name="fonts"/>
+ <parameter datatype="number" min_n_values="1" max_n_values="1" name="place_font_size" default="10" description="The size of the font to use for places when displaying a process graph." section_name="fonts"/>
+ <parameter datatype="number" min_n_values="1" max_n_values="1" name="transition_font_size" default="14" description="The size of the font to use for transitions when displaying a process graph." section_name="fonts"/>
+ <parameter datatype="string" min_n_values="1" max_n_values="1" name="guard_font_name" default="arial" description="The name of the font to use for guards when displaying a process graph. This is the name of a .ttf file available to your GraphViz installation." section_name="fonts"/>
+ <parameter datatype="string" min_n_values="1" max_n_values="1" name="place_font_name" default="arial" description="The name of the font to use for places when displaying a process graph. This is the name of a .ttf file available to your GraphViz installation." section_name="fonts"/>
+ <parameter datatype="string" min_n_values="1" max_n_values="1" name="transition_font_name" default="arialb" description="The name of the font to use for transitions when displaying a process graph. This is the name of a .ttf file available to your GraphViz installation." section_name="fonts"/>
+ <parameter datatype="string" min_n_values="1" max_n_values="1" name="tmp_path" default="/var/tmp" description="Path to a directory where we can store temporary files. It needs to be writable by the user that the webserver is running as."/>
+ <parameter datatype="string" min_n_values="1" max_n_values="1" name="graphviz_dot_path" default="/usr/local/bin/dot" description="Full path and filename for the AT and T GraphViz dot binary. Leave this blank if you don't have GraphViz installed."/>
</parameters>
</version>
Index: openacs-4/contrib/obsolete-packages/acs-workflow/sql/oracle/workflow-case-package-body.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/sql/oracle/workflow-case-package-body.sql,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/acs-workflow/sql/oracle/workflow-case-package-body.sql 9 Feb 2002 02:33:35 -0000 1.3
+++ openacs-4/contrib/obsolete-packages/acs-workflow/sql/oracle/workflow-case-package-body.sql 12 Feb 2002 01:35:16 -0000 1.4
@@ -506,7 +506,7 @@
where task_id = begin_task_action.task_id
and holding_user = begin_task_action.user_id;
if v_num_rows = 0 then
- raise_application_error(-20000, 'You are the user currently working on this task.');
+ raise_application_error(-20000, 'You are not the user currently working on this task.');
end if;
elsif v_state = 'enabled' then
if begin_task_action.action = 'cancel' then
Index: openacs-4/contrib/obsolete-packages/acs-workflow/sql/postgresql/workflow-case-package-body.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/sql/postgresql/workflow-case-package-body.sql,v
diff -u -r1.4 -r1.5
--- openacs-4/contrib/obsolete-packages/acs-workflow/sql/postgresql/workflow-case-package-body.sql 9 Feb 2002 02:33:35 -0000 1.4
+++ openacs-4/contrib/obsolete-packages/acs-workflow/sql/postgresql/workflow-case-package-body.sql 12 Feb 2002 01:35:16 -0000 1.5
@@ -435,7 +435,7 @@
where task_id = begin_task_action__task_id
and holding_user = begin_task_action__user_id;
if v_num_rows = 0 then
- raise EXCEPTION ''-20000: You are the user currently working on this task.'';
+ raise EXCEPTION ''-20000: You are not the user currently working on this task.'';
end if;
else if v_state = ''enabled'' then
if begin_task_action__action = ''cancel'' then
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/task-assignees-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/task-assignees-oracle.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/task-assignees-oracle.xql 19 Nov 2001 18:27:40 -0000 1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/task-assignees-oracle.xql 12 Feb 2002 01:35:16 -0000 1.3
@@ -27,7 +27,8 @@
select distinct u.user_id,
acs_object.name(u.user_id) as name,
- p.email
+ p.email,
+ '/shared/community-member?user_id=' || u.user_id as url
from wf_task_assignments ta,
party_approved_member_map m,
parties p,
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/task-assignees-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/task-assignees-postgresql.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/task-assignees-postgresql.xql 19 Nov 2001 18:27:40 -0000 1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/task-assignees-postgresql.xql 12 Feb 2002 01:35:16 -0000 1.3
@@ -27,7 +27,8 @@
select distinct u.user_id,
acs_object__name(u.user_id) as name,
- p.email
+ p.email,
+ '/shared/community-member?user_id=' || u.user_id as url
from wf_task_assignments ta,
party_approved_member_map m,
parties p,
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/task-assignees.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/task-assignees.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/task-assignees.tcl 19 Nov 2001 18:27:40 -0000 1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/task-assignees.tcl 12 Feb 2002 01:35:16 -0000 1.3
@@ -53,10 +53,7 @@
and m.party_id = ta.party_id
and p.party_id = m.member_id
and u.user_id = p.party_id
-} {
- incr __i
- set effective_assignees:${__i}(url) "/shared/community-member?[export_vars -url {user_id}]"
-}
+}
if { [empty_string_p $return_url] } {
set return_url "task?[export_vars -url {task_id}]"
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/task.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/task.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/task.adp 13 Jan 2002 00:30:50 -0000 1.4
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/task.adp 12 Feb 2002 01:35:16 -0000 1.5
@@ -25,7 +25,7 @@
<multiple name="panels">
<td bgcolor=@panels.bgcolor@ valign=top>
- <include src="@panels.template_url@" &="task" &="task_attributes_to_set" &="task_assigned_users" &="task_roles_to_assign" &="export_form_vars">
+ <include src="@panels.template_url@" &="task" &="task_attributes_to_set" &="task_assigned_users" &="task_roles_to_assign" &="export_form_vars" &="return_url">
</td>
</multiple>
Index: openacs-4/contrib/obsolete-packages/ticket-tracker/sql/postgresql/ticket-tracker-packages.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/ticket-tracker/sql/postgresql/ticket-tracker-packages.sql,v
diff -u -r1.10 -r1.11
--- openacs-4/contrib/obsolete-packages/ticket-tracker/sql/postgresql/ticket-tracker-packages.sql 11 Feb 2002 07:45:52 -0000 1.10
+++ openacs-4/contrib/obsolete-packages/ticket-tracker/sql/postgresql/ticket-tracker-packages.sql 12 Feb 2002 01:35:16 -0000 1.11
@@ -583,7 +583,7 @@
begin
select journal_entry__new (
null, -- journal_id
- case_id, -- object_id
+ p_case_id, -- object_id
''modify'', -- action
''Attribute Change'', -- action_pretty
now(), -- creation_date
@@ -660,10 +660,14 @@
select ttracker_util__notification_sender(v_package_id) into v_party_from;
+ -- get the package url to use as return_url in the email
+ select site_node__url(node_id) into v_url
+ from site_nodes where object_id = v_package_id;
+
v_subject := ''Ticket #'' || v_ticket_id || '' -- '' || p_custom_arg;
v_body := ''Subject: '' || v_subject || ''
'' || ''To do: '' || p_custom_arg || ''
-'' || ''Manage via: '' || ttracker_util__workflow_url(''t'') || ''task?task_id='' || p_task_id;
+'' || ''Manage via: '' || ttracker_util__workflow_url(''t'') || ''task?task_id='' || p_task_id || ''&return_url='' || v_url;
-- acs-workflow has been changed. actual notification
-- should be sent from callback now, thus it is called now
@@ -680,7 +684,7 @@
return 0;
end;' language 'plpgsql';
-
+
create function ttracker_callback__notify_admin (integer,varchar)
returns integer as '
declare
@@ -690,6 +694,7 @@
v_subject ttracker_tickets.subject%TYPE;
v_package_id ttracker_categories.package_id%TYPE;
v_request_id integer;
+ v_url varchar(1000);
admin_rec record;
begin
-- uses 2 separate queries to find out who has ''admin'' privilege
@@ -707,6 +712,10 @@
and wc.object_id = tt.ticket_id
and tt.category_id = tc.category_id;
+ -- get the package url to use as return_url in the email
+ select site_node__url(node_id) into v_url
+ from site_nodes where object_id = v_package_id;
+
for admin_rec in select u.user_id
from users u, acs_object_party_privilege_map m
where m.object_id = v_package_id
@@ -718,7 +727,7 @@
''Ticket #'' || v_ticket_id || '' -- '' || ''Assign Ticket'', -- subject
''Subject: '' || v_subject || ''
'' || ''To do: '' || ''Assign Ticket'' || ''
-'' || ''Manage via: '' || ttracker_util__workflow_url( ''t'') || ''task?task_id='' || p_task_id -- message
+'' || ''Manage via: '' || ttracker_util__workflow_url( ''t'') || ''task?task_id='' || p_task_id || ''&return_url='' || v_url -- message
) into v_request_id;
end loop;