Index: openacs-4/contrib/packages/simulation/www/simplay/document-upload.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simplay/Attic/document-upload.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/contrib/packages/simulation/www/simplay/document-upload.tcl	30 Jan 2004 14:33:35 -0000	1.8
+++ openacs-4/contrib/packages/simulation/www/simplay/document-upload.tcl	16 Mar 2004 10:34:53 -0000	1.9
@@ -6,6 +6,7 @@
     case_id:integer
     role_id:integer
     item_id:optional
+    {return_url {[export_vars -base case { case_id role_id }]}}
 }
 
 simulation::case::assert_user_may_play_role -case_id $case_id -role_id $role_id
@@ -22,12 +23,12 @@
 
 set focus "document.document_file"
 
-ad_form -name document -export { case_id role_id workflow_id } -html {enctype multipart/form-data} \
+ad_form -name document -export { case_id role_id workflow_id return_url } -html {enctype multipart/form-data} \
     -form [simulation::ui::forms::document_upload::form_block] \
     -on_submit {
 
         simulation::ui::forms::document_upload::insert_document \
             $case_id $role_id $item_id $document_file $title
 
-        ad_returnredirect [export_vars -base case { case_id role_id }]
+        ad_returnredirect $return_url
     }
Index: openacs-4/contrib/packages/simulation/www/simplay/message.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simplay/Attic/message.adp,v
diff -u -r1.10 -r1.11
--- openacs-4/contrib/packages/simulation/www/simplay/message.adp	22 Jan 2004 15:47:23 -0000	1.10
+++ openacs-4/contrib/packages/simulation/www/simplay/message.adp	16 Mar 2004 10:34:53 -0000	1.11
@@ -2,5 +2,14 @@
   <property name="title">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
   <property name="focus">@focus;noquote@</property>
+
+<if @attachment_options@ nil>
+  <p>
+    <font color="red"><em>NOTE</em></font>: To attach a document to your message you need to <a
+    href="@document_upload_url@">upload a document</a> to your
+    portfolio before writing the message.
+  </p>
+</if>
   
 <formtemplate id="message"></formtemplate>
+
Index: openacs-4/contrib/packages/simulation/www/simplay/message.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simplay/Attic/message.tcl,v
diff -u -r1.26 -r1.27
--- openacs-4/contrib/packages/simulation/www/simplay/message.tcl	11 Mar 2004 15:15:06 -0000	1.26
+++ openacs-4/contrib/packages/simulation/www/simplay/message.tcl	16 Mar 2004 10:34:53 -0000	1.27
@@ -31,6 +31,8 @@
 
 set attachment_options [simulation::case::attachment_options -case_id $case_id -role_id $role_id]
 
+set document_upload_url [export_vars -base document-upload {case_id role_id {return_url {[ad_return_url]}}}]
+
 set action [form::get_action message]
 
 
Index: openacs-4/packages/simulation/www/simplay/document-upload.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simplay/document-upload.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/simulation/www/simplay/document-upload.tcl	30 Jan 2004 14:33:35 -0000	1.8
+++ openacs-4/packages/simulation/www/simplay/document-upload.tcl	16 Mar 2004 10:34:53 -0000	1.9
@@ -6,6 +6,7 @@
     case_id:integer
     role_id:integer
     item_id:optional
+    {return_url {[export_vars -base case { case_id role_id }]}}
 }
 
 simulation::case::assert_user_may_play_role -case_id $case_id -role_id $role_id
@@ -22,12 +23,12 @@
 
 set focus "document.document_file"
 
-ad_form -name document -export { case_id role_id workflow_id } -html {enctype multipart/form-data} \
+ad_form -name document -export { case_id role_id workflow_id return_url } -html {enctype multipart/form-data} \
     -form [simulation::ui::forms::document_upload::form_block] \
     -on_submit {
 
         simulation::ui::forms::document_upload::insert_document \
             $case_id $role_id $item_id $document_file $title
 
-        ad_returnredirect [export_vars -base case { case_id role_id }]
+        ad_returnredirect $return_url
     }
Index: openacs-4/packages/simulation/www/simplay/message.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simplay/message.adp,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/simulation/www/simplay/message.adp	22 Jan 2004 15:47:23 -0000	1.10
+++ openacs-4/packages/simulation/www/simplay/message.adp	16 Mar 2004 10:34:53 -0000	1.11
@@ -2,5 +2,14 @@
   <property name="title">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
   <property name="focus">@focus;noquote@</property>
+
+<if @attachment_options@ nil>
+  <p>
+    <font color="red"><em>NOTE</em></font>: To attach a document to your message you need to <a
+    href="@document_upload_url@">upload a document</a> to your
+    portfolio before writing the message.
+  </p>
+</if>
   
 <formtemplate id="message"></formtemplate>
+
Index: openacs-4/packages/simulation/www/simplay/message.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simplay/message.tcl,v
diff -u -r1.26 -r1.27
--- openacs-4/packages/simulation/www/simplay/message.tcl	11 Mar 2004 15:15:06 -0000	1.26
+++ openacs-4/packages/simulation/www/simplay/message.tcl	16 Mar 2004 10:34:53 -0000	1.27
@@ -31,6 +31,8 @@
 
 set attachment_options [simulation::case::attachment_options -case_id $case_id -role_id $role_id]
 
+set document_upload_url [export_vars -base document-upload {case_id role_id {return_url {[ad_return_url]}}}]
+
 set action [form::get_action message]