Index: openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl,v
diff -u -r1.70.2.4 -r1.70.2.5
--- openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl 18 May 2004 16:23:46 -0000 1.70.2.4
+++ openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl 23 Dec 2004 09:48:25 -0000 1.70.2.5
@@ -2567,6 +2567,7 @@
ad_proc -public ad_returnredirect {
{-message {}}
+ {-html:boolean}
target_url
} {
Write the HTTP response required to get the browser to redirect to a different page,
@@ -2589,6 +2590,8 @@
@param message A message to display to the user. See util_user_message.
+ @param html Set this flag if your message contains HTML. If specified, you're responsible for proper quoting
+ of everything in your message. Otherwise, we quote it for you.
@see util_user_message
@see ad_script_abort
@@ -2622,7 +2625,11 @@
ns_returnredirect $url
}
- util_user_message -message $message
+ if { [string is false $html_p] } {
+ util_user_message -message $message
+ } else {
+ util_user_message -message $message -html
+ }
}
ad_proc -public util_user_message {
@@ -2642,9 +2649,10 @@
@see util_get_user_messages
} {
if { ![empty_string_p $message] } {
- if { !$html_p } {
+ if { [string is false $html_p] } {
set message [ad_quotehtml $message]
}
+
if { !$replace_p } {
set new_messages [ad_get_client_property -default {} -cache_only t "acs-kernel" "general_messages"]
lappend new_messages $message
Index: openacs-4/packages/simulation/simulation.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/simulation.info,v
diff -u -r1.12.2.5 -r1.12.2.6
--- openacs-4/packages/simulation/simulation.info 30 Nov 2004 21:50:27 -0000 1.12.2.5
+++ openacs-4/packages/simulation/simulation.info 23 Dec 2004 09:48:25 -0000 1.12.2.6
@@ -8,7 +8,7 @@
fsimulation
-
+ Collaboraid ApSO'DesignWorkflow-based task simulator. Build scenario
@@ -17,15 +17,13 @@
of students into cases, cast the students into roles, and
monitor progress. Developed as a legal education tool for
www.rechtenonline.nl.
- 2004-11-30
+ 2004-12-23
-
+
- 1
-
Index: openacs-4/packages/simulation/catalog/simulation.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/catalog/simulation.en_US.ISO-8859-1.xml,v
diff -u -r1.1.2.9 -r1.1.2.10
--- openacs-4/packages/simulation/catalog/simulation.en_US.ISO-8859-1.xml 30 Nov 2004 21:47:46 -0000 1.1.2.9
+++ openacs-4/packages/simulation/catalog/simulation.en_US.ISO-8859-1.xml 23 Dec 2004 09:48:25 -0000 1.1.2.10
@@ -1,5 +1,5 @@
-
+Abort the sessionAdd a template
@@ -18,6 +18,7 @@
Messages for %role_array.pretty_name% in %case_array.label%Case HistoryCase home
+ CasesCityBuildCityBuild HelpClear filter
@@ -100,6 +101,7 @@
Cannot enroll in simulationCannot enroll in simulation "%simulation.pretty_name%"Case "%case.label%" has been deleted.
+ Cases in which you are participatingChoose new roles for user %user.name%Choose new users for role %role.pretty_name%Create new simulation templates or edit existing ones.
@@ -151,6 +153,7 @@
Return to SimBuild HomeReturn to Simulation rootReturn to Simulation Home
+ Return to Simulation homeReturn to template list pageRight-click document name and select "Save as" (or equiv.) to download a document to your computer.Roles with actions only
@@ -173,6 +176,7 @@
Simulations in CastingSimulations in DevelopmentSome of the tasks of this simulation require attachments. However, there are no CityBuild props to select from.
+ Someone was probably faster than you and brought this session to a new state while you were reading the previous page.Start a simulation with this templateStop notifying me of changes to map XMLSubscribe to %pretty_name%
@@ -184,6 +188,7 @@
Contact your administrator if you believe this is an error. Thank you!
The following errors were encountered:The mime type of your file was not recognised.
+ The task you were trying to perform is not valid in this state.The template "%simulation.pretty_name%" is not ready for casting.There are no cases in this simulation yetThere are no documents.
@@ -300,6 +305,7 @@
Simulation %simulation.pretty_name% has now started. Please visit %simplay_url% to participate. Thank you!
Simulation %simulation.pretty_name% has startedSimulation Templates
+ Sorry!StatesStatusSub-States
Index: openacs-4/packages/simulation/lib/cases-admin.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/lib/cases-admin.tcl,v
diff -u -r1.5.2.2 -r1.5.2.3
--- openacs-4/packages/simulation/lib/cases-admin.tcl 30 Nov 2004 21:47:47 -0000 1.5.2.2
+++ openacs-4/packages/simulation/lib/cases-admin.tcl 23 Dec 2004 09:48:25 -0000 1.5.2.3
@@ -44,6 +44,8 @@
-orderby_name case_admin_order \
-elements $elements
+
+
db_multirow cases select_cases "
select wc.case_id,
sc.label,
@@ -63,6 +65,8 @@
where wc.workflow_id = w.workflow_id
and sc.sim_case_id = wc.object_id
and w.workflow_id = ao.object_id
- and ao.creation_user = :user_id
+ [ad_decode [permission::permission_p -party_id $user_id \
+ -object_id $package_id -privilege sim_admin] \
+ 1 "" "and ao.creation_user = :user_id"]
[template::list::orderby_clause -orderby -name "cases"]
"
Index: openacs-4/packages/simulation/lib/object-display.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/lib/object-display.adp,v
diff -u -r1.7.2.2 -r1.7.2.3
--- openacs-4/packages/simulation/lib/object-display.adp 30 Nov 2004 21:47:47 -0000 1.7.2.2
+++ openacs-4/packages/simulation/lib/object-display.adp 23 Dec 2004 09:48:25 -0000 1.7.2.3
@@ -18,9 +18,11 @@
+