Index: openacs-4/packages/imsld/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/admin/index.tcl,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/imsld/www/admin/index.tcl 30 May 2007 08:36:22 -0000 1.16
+++ openacs-4/packages/imsld/www/admin/index.tcl 17 Apr 2008 17:17:54 -0000 1.17
@@ -23,7 +23,12 @@
content::item::set_live_revision -revision_id [content::item::get_best_revision -item_id $set_imsld_id_live]
}
if { ![string eq "" $set_run_id_live] } {
- db_dml make_run_live { *SQL* }
+ # if there are no users assigned to the run, we mark it as waiting, otherwise mark it active
+ if { ![llength [imsld::runtime::users_in_run -run_id $set_run_id_live]] } {
+ db_dml make_run_waiting { *SQL* }
+ } else {
+ db_dml make_run_live { *SQL* }
+ }
}
set package_id [ad_conn package_id]
@@ -47,6 +52,7 @@
-name imslds \
-multirow imslds \
-key imsld_id \
+ -pass_properties { return_url } \
-orderby_name imsld_orderby \
-orderby { default_value imsld_title } \
-elements {
@@ -62,12 +68,19 @@
}
create_run {
label {}
- display_template {@imslds.create_run;noquote@}
+ display_template {
+ [_ imsld.create_new_run]
+ }
}
delete {
label {}
sub_class narrow
- display_template {@imslds.delete_template;noquote@}
+ display_template {
+ [_ imsld.Deleted] [_ imsld.Make_it_live]
+
+
+
+ }
link_html { title "[_ imsld.Delete_IMS_LD]" }
}
}
@@ -76,17 +89,8 @@
set cr_root_folder_id [imsld::cr::get_root_folder -community_id $community_id]
-db_multirow -extend { delete_template create_run } imslds get_imslds { *SQL* } {
+db_multirow -extend { delete_template create_run } imslds get_imslds { *SQL* } {}
- if { [empty_string_p $live_revision] } {
- set delete_template "[_ imsld.Deleted] [_ imsld.Make_it_live]"
- set create_run ""
- } else {
- set delete_template "\">"
- set create_run " [_ imsld.create_new_run] "
- }
-}
-
set imsld_package_id [site_node_apm_integration::get_child_package_id \
-package_id [dotlrn_community::get_package_id $community_id] \
-package_key "[imsld::package_key]"]
@@ -95,6 +99,7 @@
template::list::create \
-name imsld_runs \
-multirow imsld_runs \
+ -pass_properties { return_url } \
-key run_id \
-elements {
imsld_title {
@@ -115,13 +120,25 @@
orderby_desc {creation_date desc}
}
manage {
- label ""
- display_template {@imsld_runs.manage;noquote@}
+ label {}
+ display_template {
+ [_ imsld.View_members] | [_ imsld.Monitor]
+
+
+
+ [_ imsld.Manage_Members]
+
+ }
}
delete {
label {}
sub_class narrow
- display_template {@imsld_runs.delete_template;noquote@}
+ display_template {
+ [_ imsld.Deleted] [_ imsld.Make_it_live]
+
+
+
+ }
link_html { title "[_ imsld.Delete_Run]" }
}
} \
@@ -134,32 +151,22 @@
set cr_root_folder_id [imsld::cr::get_root_folder -community_id $community_id]
db_multirow -extend { manage delete_template image_path image_alt image_title } imsld_runs get_runs { *SQL* } {
-
- set delete_template ""
-
switch $status {
- deleted {
- set delete_template "[_ imsld.Deleted] [_ imsld.Make_it_live]"
- }
active {
- set delete_template ""
set image_alt "[_ imsld.active]"
set image_title "[_ imsld.active]"
set image_path "[lindex [site_node::get_url_from_object_id -object_id $imsld_package_id] 0]/resources/active.png"
- set manage "[_ imsld.View_members] | [_ imsld.Monitor]"
}
waiting {
set image_alt "[_ imsld.waiting]"
set image_title "[_ imsld.waiting]"
set image_path "[lindex [site_node::get_url_from_object_id -object_id $imsld_package_id] 0]/resources/waiting.png"
- set create_run " [_ imsld.create_new_run] "
- set manage "[_ imsld.Manage_Members]"
}
stopped {
set image_alt "[_ imsld.stopped]"
set image_title "[_ imsld.stopped]"
set image_path "[lindex [site_node::get_url_from_object_id -object_id $imsld_package_id] 0]/resources/completed.png"
- set manage "[_ imsld.View_members] | [_ imsld.Monitor]"
}
}
}
+