Index: openacs-4/contrib/packages/simulation/tcl/ui-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/tcl/Attic/ui-procs.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/contrib/packages/simulation/tcl/ui-procs.tcl 30 Jan 2004 11:17:16 -0000 1.4
+++ openacs-4/contrib/packages/simulation/tcl/ui-procs.tcl 30 Jan 2004 11:23:25 -0000 1.5
@@ -24,10 +24,6 @@
{label "Title"}
{html {size 50}}
}
- {description:text(textarea),optional
- {label "Description"}
- {html {cols 60 rows 8}}
- }
}
}
@@ -65,7 +61,6 @@
item_id
document_file
title
- description
{entry_id {}}
} {
Does the document insertion in the DB.
@@ -93,8 +88,7 @@
-item_id $item_id \
-title $title \
-content_type $content_type \
- -upload_file $document_file \
- -description $description]
+ -upload_file $document_file]
bcms::revision::set_revision_status \
-revision_id $revision_id \
Index: openacs-4/contrib/packages/simulation/www/simplay/case-admin.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simplay/Attic/case-admin.tcl,v
diff -u -r1.13 -r1.14
--- openacs-4/contrib/packages/simulation/www/simplay/case-admin.tcl 30 Jan 2004 11:17:16 -0000 1.13
+++ openacs-4/contrib/packages/simulation/www/simplay/case-admin.tcl 30 Jan 2004 11:23:25 -0000 1.14
@@ -186,6 +186,7 @@
a.short_name as action_short_name,
a.pretty_name as action_pretty,
a.pretty_past_tense as action_pretty_past_tense,
+ role.role_id,
role.pretty_name as role_pretty,
io.creation_user,
iou.first_names || ' ' || iou.last_name as user_name,
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.23 -r1.24
--- openacs-4/contrib/packages/simulation/www/simplay/message.tcl 27 Jan 2004 12:48:39 -0000 1.23
+++ openacs-4/contrib/packages/simulation/www/simplay/message.tcl 30 Jan 2004 11:23:25 -0000 1.24
@@ -190,7 +190,7 @@
# display mode - show a list of attached documents
set attachments ""
foreach attachment_set $attachments_set_list {
- set object_url [simulation::object::url -name [ns_set get $attachment_set name]]
+ set object_url [simulation::object::content_url -name [ns_set get $attachment_set name]]
set object_title [ns_set get $attachment_set title]
append attachments "$object_title
"
}
@@ -228,4 +228,3 @@
element set_properties message recipient_role_id -options $all_role_options
}
-#TODO B (0.5h): add "select all" javascript checkbox for To field -- add as separate 'inform' form element.
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 -r1.18 -r1.19
--- openacs-4/contrib/packages/simulation/www/simplay/task-detail.tcl 30 Jan 2004 11:17:16 -0000 1.18
+++ openacs-4/contrib/packages/simulation/www/simplay/task-detail.tcl 30 Jan 2004 11:23:25 -0000 1.19
@@ -125,7 +125,7 @@
-comment_mime_type "text/plain"]
simulation::ui::forms::document_upload::insert_document \
- $case_id $role_id $item_id $document_file $title $description $entry_id
+ $case_id $role_id $item_id $document_file $title $entry_id
}
ad_returnredirect [export_vars -base tasks { case_id role_id }]
@@ -134,4 +134,3 @@
set focus "document.document_file"
}
-# TODO B (0.5h): show task attachment links beneath the action description
Index: openacs-4/contrib/packages/simulation/www/simplay/tasks.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simplay/Attic/tasks.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/contrib/packages/simulation/www/simplay/tasks.tcl 27 Jan 2004 12:48:39 -0000 1.7
+++ openacs-4/contrib/packages/simulation/www/simplay/tasks.tcl 30 Jan 2004 11:23:25 -0000 1.8
@@ -13,4 +13,3 @@
set user_id [ad_conn user_id]
-# TODO B (1h): make sure to show all completed tasks (one reason is that this is the only way to see documents that are part of tasks)
Index: openacs-4/packages/simulation/tcl/ui-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/tcl/ui-procs.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/simulation/tcl/ui-procs.tcl 30 Jan 2004 11:17:16 -0000 1.4
+++ openacs-4/packages/simulation/tcl/ui-procs.tcl 30 Jan 2004 11:23:25 -0000 1.5
@@ -24,10 +24,6 @@
{label "Title"}
{html {size 50}}
}
- {description:text(textarea),optional
- {label "Description"}
- {html {cols 60 rows 8}}
- }
}
}
@@ -65,7 +61,6 @@
item_id
document_file
title
- description
{entry_id {}}
} {
Does the document insertion in the DB.
@@ -93,8 +88,7 @@
-item_id $item_id \
-title $title \
-content_type $content_type \
- -upload_file $document_file \
- -description $description]
+ -upload_file $document_file]
bcms::revision::set_revision_status \
-revision_id $revision_id \
Index: openacs-4/packages/simulation/www/simplay/case-admin.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simplay/case-admin.tcl,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/simulation/www/simplay/case-admin.tcl 30 Jan 2004 11:17:16 -0000 1.13
+++ openacs-4/packages/simulation/www/simplay/case-admin.tcl 30 Jan 2004 11:23:25 -0000 1.14
@@ -186,6 +186,7 @@
a.short_name as action_short_name,
a.pretty_name as action_pretty,
a.pretty_past_tense as action_pretty_past_tense,
+ role.role_id,
role.pretty_name as role_pretty,
io.creation_user,
iou.first_names || ' ' || iou.last_name as user_name,
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.23 -r1.24
--- openacs-4/packages/simulation/www/simplay/message.tcl 27 Jan 2004 12:48:39 -0000 1.23
+++ openacs-4/packages/simulation/www/simplay/message.tcl 30 Jan 2004 11:23:25 -0000 1.24
@@ -190,7 +190,7 @@
# display mode - show a list of attached documents
set attachments ""
foreach attachment_set $attachments_set_list {
- set object_url [simulation::object::url -name [ns_set get $attachment_set name]]
+ set object_url [simulation::object::content_url -name [ns_set get $attachment_set name]]
set object_title [ns_set get $attachment_set title]
append attachments "$object_title
"
}
@@ -228,4 +228,3 @@
element set_properties message recipient_role_id -options $all_role_options
}
-#TODO B (0.5h): add "select all" javascript checkbox for To field -- add as separate 'inform' form element.
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 -r1.18 -r1.19
--- openacs-4/packages/simulation/www/simplay/task-detail.tcl 30 Jan 2004 11:17:16 -0000 1.18
+++ openacs-4/packages/simulation/www/simplay/task-detail.tcl 30 Jan 2004 11:23:25 -0000 1.19
@@ -125,7 +125,7 @@
-comment_mime_type "text/plain"]
simulation::ui::forms::document_upload::insert_document \
- $case_id $role_id $item_id $document_file $title $description $entry_id
+ $case_id $role_id $item_id $document_file $title $entry_id
}
ad_returnredirect [export_vars -base tasks { case_id role_id }]
@@ -134,4 +134,3 @@
set focus "document.document_file"
}
-# TODO B (0.5h): show task attachment links beneath the action description
Index: openacs-4/packages/simulation/www/simplay/tasks.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simplay/tasks.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/simulation/www/simplay/tasks.tcl 27 Jan 2004 12:48:39 -0000 1.7
+++ openacs-4/packages/simulation/www/simplay/tasks.tcl 30 Jan 2004 11:23:25 -0000 1.8
@@ -13,4 +13,3 @@
set user_id [ad_conn user_id]
-# TODO B (1h): make sure to show all completed tasks (one reason is that this is the only way to see documents that are part of tasks)