Index: openacs-4/contrib/packages/simulation/lib/object-display.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/lib/Attic/object-display.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/contrib/packages/simulation/lib/object-display.tcl 3 Nov 2003 14:13:42 -0000 1.8
+++ openacs-4/contrib/packages/simulation/lib/object-display.tcl 14 Nov 2003 09:48:54 -0000 1.9
@@ -12,7 +12,7 @@
set root_id [bcms::folder::get_id_by_package_id -parent_id 0]
# This little exercise removes the object/ part from the extra_url
-set extra_url [eval file join [lrange [file split [ad_conn extra_url]] 1 end]]
+set extra_url [eval file join [lrange [file split [ad_conn extra_url]] 2 end]]
if { [empty_string_p $extra_url] } {
set extra_url "index"
@@ -24,6 +24,7 @@
} else {
array set item [bcms::revision::get_revision -revision_id $revision_id]
}
+
item::get_content \
-revision_id $item(revision_id) \
-array content
Index: openacs-4/contrib/packages/simulation/lib/sim-template-roles.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/lib/Attic/sim-template-roles.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/contrib/packages/simulation/lib/sim-template-roles.tcl 13 Nov 2003 13:32:39 -0000 1.4
+++ openacs-4/contrib/packages/simulation/lib/sim-template-roles.tcl 14 Nov 2003 09:48:54 -0000 1.5
@@ -46,9 +46,10 @@
}
delete {
sub_class narrow
- link_url_col delete_url
display_template {
- 
+
+
+
}
}
}
Index: openacs-4/contrib/packages/simulation/lib/sim-template-tasks.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/lib/Attic/sim-template-tasks.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/contrib/packages/simulation/lib/sim-template-tasks.tcl 12 Nov 2003 14:51:16 -0000 1.4
+++ openacs-4/contrib/packages/simulation/lib/sim-template-tasks.tcl 14 Nov 2003 09:48:54 -0000 1.5
@@ -68,10 +68,11 @@
}
delete {
sub_class narrow
- link_url_col delete_url
hide_p {[ad_decode $display_mode edit 0 1]}
display_template {
-
+
+
+
}
}
}
Index: openacs-4/contrib/packages/simulation/lib/sim-templates.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/lib/Attic/sim-templates.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/packages/simulation/lib/sim-templates.tcl 12 Nov 2003 14:51:16 -0000 1.3
+++ openacs-4/contrib/packages/simulation/lib/sim-templates.tcl 14 Nov 2003 09:48:54 -0000 1.4
@@ -24,7 +24,7 @@
template::list::create \
-name sim_templates \
-multirow sim_templates \
- -actions { "Add a template" sim-template-edit } \
+ -actions { "Add a template" template-edit } \
-elements {
name {
label "Template"
@@ -43,7 +43,7 @@
template::list::create \
-name sim_templates \
-multirow sim_templates \
- -actions { "Add a template" sim-template-edit } \
+ -actions { "Add a template" template-edit } \
-elements {
edit {
sub_class narrow
@@ -118,7 +118,7 @@
[template::list::orderby_clause -orderby -name sim_templates]
" {
set description [string_truncate -len 200 $description]
- set edit_url [export_vars -base "sim-template-edit?workflow_id=$workflow_id"]
- set view_url [export_vars -base "sim-template-edit?workflow_id=$workflow_id"]
+ set edit_url [export_vars -base "template-edit?workflow_id=$workflow_id"]
+ set view_url [export_vars -base "template-edit?workflow_id=$workflow_id"]
set delete_url [export_vars -base "sim-template-delete?workflow_id=$workflow_id"]
}
Index: openacs-4/contrib/packages/simulation/test/demo-data-setup.test
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/test/Attic/demo-data-setup.test,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/simulation/test/demo-data-setup.test 6 Nov 2003 15:35:47 -0000 1.2
+++ openacs-4/contrib/packages/simulation/test/demo-data-setup.test 14 Nov 2003 09:48:54 -0000 1.3
@@ -53,8 +53,8 @@
ad_proc ::twt::simulation::visit_template_page { template_name } {
- do_request /simulation/sim-template-list
- link follow ~u sim-template-edit ~c $template_name
+ do_request /simulation/simbuild/
+ link follow ~u template-edit ~c $template_name
}
if { [catch {
@@ -128,7 +128,7 @@
}
::twt::log_section "Create simulation template"
- do_request /simulation/sim-template-edit
+ do_request /simulation/template-edit
set template_name "Elementary Private Law"
field fill $template_name ~n name
form submit
Index: openacs-4/contrib/packages/simulation/www/simbuild/task-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simbuild/Attic/task-edit.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/simulation/www/simbuild/task-edit.tcl 13 Nov 2003 15:35:48 -0000 1.1
+++ openacs-4/contrib/packages/simulation/www/simbuild/task-edit.tcl 14 Nov 2003 09:48:54 -0000 1.2
@@ -4,8 +4,8 @@
@creation-date 2003-10-27
@cvs-id $Id$
} {
- workflow_id
- action_id:optional
+ workflow_id:integer,optional
+ action_id:integer,optional
} -validate {
workflow_id_or_task_id {
if { ![exists_and_not_null workflow_id] &&
@@ -21,7 +21,11 @@
#
######################################################################
-workflow::get -workflow_id $workflow_id -array sim_template_array
+if { [info exists workflow_id] } {
+ workflow::get -workflow_id $workflow_id -array sim_template_array
+} else {
+ set workflow_id ""
+}
set package_key [ad_conn package_key]
set package_id [ad_conn package_id]
@@ -69,7 +73,9 @@
list [list [ad_decode [ad_form_new_p -key action_id] 1 [_ acs-kernel.common_add] [_ acs-kernel.common_edit]] ok]
] -form {
{action_id:key}
- {workflow_id:integer(hidden),optional}
+ {workflow_id:integer(hidden)
+ {value $workflow_id}
+ }
{name:text
{label "Task"}
{html {size 20}}
Index: openacs-4/packages/simulation/lib/object-display.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/lib/object-display.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/simulation/lib/object-display.tcl 3 Nov 2003 14:13:42 -0000 1.8
+++ openacs-4/packages/simulation/lib/object-display.tcl 14 Nov 2003 09:48:54 -0000 1.9
@@ -12,7 +12,7 @@
set root_id [bcms::folder::get_id_by_package_id -parent_id 0]
# This little exercise removes the object/ part from the extra_url
-set extra_url [eval file join [lrange [file split [ad_conn extra_url]] 1 end]]
+set extra_url [eval file join [lrange [file split [ad_conn extra_url]] 2 end]]
if { [empty_string_p $extra_url] } {
set extra_url "index"
@@ -24,6 +24,7 @@
} else {
array set item [bcms::revision::get_revision -revision_id $revision_id]
}
+
item::get_content \
-revision_id $item(revision_id) \
-array content
Index: openacs-4/packages/simulation/lib/sim-template-roles.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/lib/sim-template-roles.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/simulation/lib/sim-template-roles.tcl 13 Nov 2003 13:32:39 -0000 1.4
+++ openacs-4/packages/simulation/lib/sim-template-roles.tcl 14 Nov 2003 09:48:54 -0000 1.5
@@ -46,9 +46,10 @@
}
delete {
sub_class narrow
- link_url_col delete_url
display_template {
-
+
+
+
}
}
}
Index: openacs-4/packages/simulation/lib/sim-template-tasks.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/lib/sim-template-tasks.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/simulation/lib/sim-template-tasks.tcl 12 Nov 2003 14:51:16 -0000 1.4
+++ openacs-4/packages/simulation/lib/sim-template-tasks.tcl 14 Nov 2003 09:48:54 -0000 1.5
@@ -68,10 +68,11 @@
}
delete {
sub_class narrow
- link_url_col delete_url
hide_p {[ad_decode $display_mode edit 0 1]}
display_template {
-
+
+
+
}
}
}
Index: openacs-4/packages/simulation/lib/sim-templates.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/lib/sim-templates.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/simulation/lib/sim-templates.tcl 12 Nov 2003 14:51:16 -0000 1.3
+++ openacs-4/packages/simulation/lib/sim-templates.tcl 14 Nov 2003 09:48:54 -0000 1.4
@@ -24,7 +24,7 @@
template::list::create \
-name sim_templates \
-multirow sim_templates \
- -actions { "Add a template" sim-template-edit } \
+ -actions { "Add a template" template-edit } \
-elements {
name {
label "Template"
@@ -43,7 +43,7 @@
template::list::create \
-name sim_templates \
-multirow sim_templates \
- -actions { "Add a template" sim-template-edit } \
+ -actions { "Add a template" template-edit } \
-elements {
edit {
sub_class narrow
@@ -118,7 +118,7 @@
[template::list::orderby_clause -orderby -name sim_templates]
" {
set description [string_truncate -len 200 $description]
- set edit_url [export_vars -base "sim-template-edit?workflow_id=$workflow_id"]
- set view_url [export_vars -base "sim-template-edit?workflow_id=$workflow_id"]
+ set edit_url [export_vars -base "template-edit?workflow_id=$workflow_id"]
+ set view_url [export_vars -base "template-edit?workflow_id=$workflow_id"]
set delete_url [export_vars -base "sim-template-delete?workflow_id=$workflow_id"]
}
Index: openacs-4/packages/simulation/test/demo-data-setup.test
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/test/demo-data-setup.test,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/simulation/test/demo-data-setup.test 6 Nov 2003 15:35:47 -0000 1.2
+++ openacs-4/packages/simulation/test/demo-data-setup.test 14 Nov 2003 09:48:54 -0000 1.3
@@ -53,8 +53,8 @@
ad_proc ::twt::simulation::visit_template_page { template_name } {
- do_request /simulation/sim-template-list
- link follow ~u sim-template-edit ~c $template_name
+ do_request /simulation/simbuild/
+ link follow ~u template-edit ~c $template_name
}
if { [catch {
@@ -128,7 +128,7 @@
}
::twt::log_section "Create simulation template"
- do_request /simulation/sim-template-edit
+ do_request /simulation/template-edit
set template_name "Elementary Private Law"
field fill $template_name ~n name
form submit
Index: openacs-4/packages/simulation/www/simbuild/task-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simbuild/task-edit.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/simulation/www/simbuild/task-edit.tcl 13 Nov 2003 15:35:48 -0000 1.1
+++ openacs-4/packages/simulation/www/simbuild/task-edit.tcl 14 Nov 2003 09:48:54 -0000 1.2
@@ -4,8 +4,8 @@
@creation-date 2003-10-27
@cvs-id $Id$
} {
- workflow_id
- action_id:optional
+ workflow_id:integer,optional
+ action_id:integer,optional
} -validate {
workflow_id_or_task_id {
if { ![exists_and_not_null workflow_id] &&
@@ -21,7 +21,11 @@
#
######################################################################
-workflow::get -workflow_id $workflow_id -array sim_template_array
+if { [info exists workflow_id] } {
+ workflow::get -workflow_id $workflow_id -array sim_template_array
+} else {
+ set workflow_id ""
+}
set package_key [ad_conn package_key]
set package_id [ad_conn package_id]
@@ -69,7 +73,9 @@
list [list [ad_decode [ad_form_new_p -key action_id] 1 [_ acs-kernel.common_add] [_ acs-kernel.common_edit]] ok]
] -form {
{action_id:key}
- {workflow_id:integer(hidden),optional}
+ {workflow_id:integer(hidden)
+ {value $workflow_id}
+ }
{name:text
{label "Task"}
{html {size 20}}