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 @@
+
@@ -75,29 +76,27 @@
+
-
-
-
-
-
+
+
@@ -110,14 +109,12 @@
-
-
@@ -215,12 +212,16 @@
+
+
+
+
+
-
@@ -248,6 +249,7 @@
+
@@ -276,20 +278,17 @@
-
-
-
@@ -362,13 +361,23 @@
+
+
+
+
+
+
+
+
+
+
@@ -412,6 +421,7 @@
+
@@ -490,14 +500,14 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
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 @@
|
-
+
|
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;