- Merged changes from V3.3(?)

acs-workflow.info

@@ -25,6 +25,7 @@
         <provides url="acs-workflow" version="4.5.3"/>
         <requires url="acs-kernel" version="4.6.2"/>
         <requires url="notifications" version="4.0"/>
+	<requires url="acs-mail" version="4.1"/>
 
         <parameters>
             <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"/>

www/admin/static-assignments-table-postgresql.xql

@@ -42,12 +42,12 @@ order by
                    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
 	           )
 
       </querytext>

www/assignee-add-postgresql.xql

@@ -6,23 +6,26 @@
 <fullquery name="unassigned_parties">      
       <querytext>
       
-    select p.party_id,
-           acs_object__name(p.party_id) as name,
-           p.email
-      from parties p,
-           ($group_user_select_sql) pp
-     where 
-	   p.party_id = pp.party_id
- 	   and not exists (
+select
+	p.party_id,
+        acs_object__name(p.party_id) as name,
+        p.email
+from
+	parties p,
+        ($group_user_select_sql) pp
+where 
+	p.party_id = pp.party_id
+ 	and not exists (
 		select 1 
 		from wf_task_assignments ta 
 		where ta.task_id = :task_id and ta.party_id = p.party_id
-	   )
-       and 0 < (select count(*)
+	)
+	and 0 < (select count(*)
                 from   users u, party_approved_member_map m
                 where  m.party_id = p.party_id
                 and    u.user_id = m.member_id)
-  order by name, email
+order by
+	name, email
 
       </querytext>
 </fullquery>

www/task.tcl

@@ -12,6 +12,7 @@ ad_page_contract {
     {msg:html {}}
     {vertical:integer 0}
     {return_url ""}
+    {force_return_url 0}
 } -properties {
     case_id
     context
@@ -26,12 +27,12 @@ ad_page_contract {
 # ---------------------------------------------------------
 # Defaults & Security
 
-# ToDo: NOTE! We need to add some double-click protection here.
-
 # We don't force the user to authentify, is that right?
 set user_id [ad_get_user_id]
 set current_url [im_url_with_query]
 
+# ToDo: NOTE! We need to add some double-click protection here.
+
 set the_action [array names action]
 if { [llength $the_action] > 1 } {
     ad_return_error "Invalid input" "More than one action was requested"
@@ -40,8 +41,9 @@ if { [llength $the_action] > 1 } {
     
     set journal_id [wf_task_action -user_id $user_id -msg $msg -attributes [array get attributes] -assignments [array get assignments] $task_id $the_action]
 
-    # After a "finish" actioin we can go back to return_url directly.
+    # After a "finish" action we can go back to return_url directly.
     if {"finish" == $the_action} { ad_returnredirect $return_url }
+
     # Otherwise go back to the tasks's page
     ad_returnredirect "task?[export_url_vars task_id return_url]"