Index: openacs-4/contrib/packages/simulation/lib/tasks.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/lib/Attic/tasks.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/contrib/packages/simulation/lib/tasks.tcl	19 Dec 2003 14:00:38 -0000	1.2
+++ openacs-4/contrib/packages/simulation/lib/tasks.tcl	19 Dec 2003 14:22:53 -0000	1.3
@@ -13,6 +13,10 @@
     }
 }
 
+if { [empty_string_p $case_id] } {
+    unset case_id
+}
+
 set package_id [ad_conn package_id]
 
 set elements {
Index: openacs-4/contrib/packages/simulation/www/simplay/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simplay/Attic/index.adp,v
diff -u -N -r1.10 -r1.11
--- openacs-4/contrib/packages/simulation/www/simplay/index.adp	19 Dec 2003 13:03:22 -0000	1.10
+++ openacs-4/contrib/packages/simulation/www/simplay/index.adp	19 Dec 2003 14:22:53 -0000	1.11
@@ -8,9 +8,10 @@
 <p></p>
 
 <if @adminplayer_p@>
-  <h3>Administrators</h3>
+  <h3>All Messages</h3>
   <include src="/packages/simulation/lib/messages" user_id="@user_id@"></include>
-  <p>
+  <p></p>
+  <h3>All Tasks</h3>
   <include src="/packages/simulation/lib/tasks" user_id="@user_id@"></include>
 </if>
 
Index: openacs-4/contrib/packages/simulation/www/simplay/play-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simplay/Attic/play-master.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/simulation/www/simplay/play-master.tcl	19 Dec 2003 14:00:39 -0000	1.1
+++ openacs-4/contrib/packages/simulation/www/simplay/play-master.tcl	19 Dec 2003 14:22:53 -0000	1.2
@@ -1,5 +1,6 @@
-ad_page_contract {
-    Simplay master: Links to tasks, messages, etc.
-} {
-    {case_id:integer ""}
+
+# case_id: either passed as a property, or in the URL
+
+if { ![exists_and_not_null case_id] } {
+    set case_id [ns_queryget case_id]
 }
Index: openacs-4/contrib/packages/simulation/www/simplay/task-detail.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simplay/Attic/task-detail.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/contrib/packages/simulation/www/simplay/task-detail.adp	19 Dec 2003 14:00:39 -0000	1.3
+++ openacs-4/contrib/packages/simulation/www/simplay/task-detail.adp	19 Dec 2003 14:22:53 -0000	1.4
@@ -2,5 +2,6 @@
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
   <property name="focus">action.subject</property>
+  <property name="case_id">@case_id@</property>
 
 <formtemplate id="action"></formtemplate>
Index: openacs-4/contrib/packages/simulation/www/simplay/task-detail.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simplay/Attic/task-detail.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/contrib/packages/simulation/www/simplay/task-detail.tcl	19 Dec 2003 14:00:39 -0000	1.3
+++ openacs-4/contrib/packages/simulation/www/simplay/task-detail.tcl	19 Dec 2003 14:22:53 -0000	1.4
@@ -8,10 +8,11 @@
 
 workflow::case::enabled_action_get -enabled_action_id $enabled_action_id -array enabled_action
 
-simulation::action::get -action_id $enabled_action(action_id) -array action
-
 set case_id $enabled_action(case_id)
+set action_id $enabled_action(action_id)
 
+simulation::action::get -action_id $action_id -array action
+
 set title "Task"
 set context [list [list . "SimPlay"] [list [export_vars -base case { case_id }] "Case"] [list [export_vars -base tasks { case_id }] "Tasks"] $title]
 
@@ -47,8 +48,25 @@
 } -on_request {
     set pretty_name $action(pretty_name)
     set description [template::util::richtext::create $action(description) $action(description_mime_type)]
-    set document "TODO"
 
+    set documents {}
+    db_foreach documents {
+        select cr.title as object_title,
+               ci.name as object_name
+        from   sim_task_object_map m,
+               cr_items ci,
+               cr_revisions cr
+        where  m.task_id = :action_id
+        and    m.relation_tag = 'attachment'
+        and    ci.item_id = m.object_id
+        and    cr.revision_id = ci.live_revision
+        order by m.order_n
+    } {
+        set object_url [simulation::object::url \
+                            -name $object_name]
+        append documents "<a href=\"$object_url\">$object_title</a><br>"
+    }
+
     set recipient_name [simulation::role::get_element -role_id $action(recipient) -element pretty_name]
     set sender_name [simulation::role::get_element -role_id $action(assigned_role_id) -element pretty_name]
 }
Index: openacs-4/packages/simulation/lib/tasks.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/lib/tasks.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/simulation/lib/tasks.tcl	19 Dec 2003 14:00:38 -0000	1.2
+++ openacs-4/packages/simulation/lib/tasks.tcl	19 Dec 2003 14:22:53 -0000	1.3
@@ -13,6 +13,10 @@
     }
 }
 
+if { [empty_string_p $case_id] } {
+    unset case_id
+}
+
 set package_id [ad_conn package_id]
 
 set elements {
Index: openacs-4/packages/simulation/www/simplay/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simplay/index.adp,v
diff -u -N -r1.10 -r1.11
--- openacs-4/packages/simulation/www/simplay/index.adp	19 Dec 2003 13:03:22 -0000	1.10
+++ openacs-4/packages/simulation/www/simplay/index.adp	19 Dec 2003 14:22:53 -0000	1.11
@@ -8,9 +8,10 @@
 <p></p>
 
 <if @adminplayer_p@>
-  <h3>Administrators</h3>
+  <h3>All Messages</h3>
   <include src="/packages/simulation/lib/messages" user_id="@user_id@"></include>
-  <p>
+  <p></p>
+  <h3>All Tasks</h3>
   <include src="/packages/simulation/lib/tasks" user_id="@user_id@"></include>
 </if>
 
Index: openacs-4/packages/simulation/www/simplay/play-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simplay/play-master.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/simulation/www/simplay/play-master.tcl	19 Dec 2003 14:00:39 -0000	1.1
+++ openacs-4/packages/simulation/www/simplay/play-master.tcl	19 Dec 2003 14:22:53 -0000	1.2
@@ -1,5 +1,6 @@
-ad_page_contract {
-    Simplay master: Links to tasks, messages, etc.
-} {
-    {case_id:integer ""}
+
+# case_id: either passed as a property, or in the URL
+
+if { ![exists_and_not_null case_id] } {
+    set case_id [ns_queryget case_id]
 }
Index: openacs-4/packages/simulation/www/simplay/task-detail.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simplay/task-detail.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/simulation/www/simplay/task-detail.adp	19 Dec 2003 14:00:39 -0000	1.3
+++ openacs-4/packages/simulation/www/simplay/task-detail.adp	19 Dec 2003 14:22:53 -0000	1.4
@@ -2,5 +2,6 @@
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
   <property name="focus">action.subject</property>
+  <property name="case_id">@case_id@</property>
 
 <formtemplate id="action"></formtemplate>
Index: openacs-4/packages/simulation/www/simplay/task-detail.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simplay/task-detail.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/simulation/www/simplay/task-detail.tcl	19 Dec 2003 14:00:39 -0000	1.3
+++ openacs-4/packages/simulation/www/simplay/task-detail.tcl	19 Dec 2003 14:22:53 -0000	1.4
@@ -8,10 +8,11 @@
 
 workflow::case::enabled_action_get -enabled_action_id $enabled_action_id -array enabled_action
 
-simulation::action::get -action_id $enabled_action(action_id) -array action
-
 set case_id $enabled_action(case_id)
+set action_id $enabled_action(action_id)
 
+simulation::action::get -action_id $action_id -array action
+
 set title "Task"
 set context [list [list . "SimPlay"] [list [export_vars -base case { case_id }] "Case"] [list [export_vars -base tasks { case_id }] "Tasks"] $title]
 
@@ -47,8 +48,25 @@
 } -on_request {
     set pretty_name $action(pretty_name)
     set description [template::util::richtext::create $action(description) $action(description_mime_type)]
-    set document "TODO"
 
+    set documents {}
+    db_foreach documents {
+        select cr.title as object_title,
+               ci.name as object_name
+        from   sim_task_object_map m,
+               cr_items ci,
+               cr_revisions cr
+        where  m.task_id = :action_id
+        and    m.relation_tag = 'attachment'
+        and    ci.item_id = m.object_id
+        and    cr.revision_id = ci.live_revision
+        order by m.order_n
+    } {
+        set object_url [simulation::object::url \
+                            -name $object_name]
+        append documents "<a href=\"$object_url\">$object_title</a><br>"
+    }
+
     set recipient_name [simulation::role::get_element -role_id $action(recipient) -element pretty_name]
     set sender_name [simulation::role::get_element -role_id $action(assigned_role_id) -element pretty_name]
 }