Index: openacs-4/packages/assessment/assessment.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/assessment.info,v diff -u -r1.36 -r1.37 --- openacs-4/packages/assessment/assessment.info 25 Apr 2005 12:20:07 -0000 1.36 +++ openacs-4/packages/assessment/assessment.info 9 Jun 2005 19:19:47 -0000 1.37 @@ -23,7 +23,7 @@ - + Index: openacs-4/packages/assessment/catalog/assessment.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/catalog/assessment.en_US.ISO-8859-1.xml,v diff -u -r1.70 -r1.71 --- openacs-4/packages/assessment/catalog/assessment.en_US.ISO-8859-1.xml 1 Jun 2005 02:10:52 -0000 1.70 +++ openacs-4/packages/assessment/catalog/assessment.en_US.ISO-8859-1.xml 9 Jun 2005 19:19:47 -0000 1.71 @@ -523,6 +523,7 @@ Session Remaining session time: %assessment_data.pretty_remaining_time% Sessions + New Registration Assessment Show Assessments Show Feedback Question name displayed Index: openacs-4/packages/assessment/lib/section-items.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/section-items.tcl,v diff -u -r1.9 -r1.10 --- openacs-4/packages/assessment/lib/section-items.tcl 13 Apr 2005 18:51:54 -0000 1.9 +++ openacs-4/packages/assessment/lib/section-items.tcl 9 Jun 2005 19:19:47 -0000 1.10 @@ -27,6 +27,7 @@ set checks [as::section::checks_list -assessment_id $assessment_id -section_id $section_id] set checks_related 0 + ns_log notice "[llength $checks]" foreach check_sql $checks { set cond_list [split $check_sql "="] set item_id [lindex [split [lindex $cond_list 2] " "] 0] Index: openacs-4/packages/assessment/sql/postgresql/assessment-actions-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/sql/postgresql/assessment-actions-create.sql,v diff -u -r1.7 -r1.8 --- openacs-4/packages/assessment/sql/postgresql/assessment-actions-create.sql 13 Mar 2005 22:08:45 -0000 1.7 +++ openacs-4/packages/assessment/sql/postgresql/assessment-actions-create.sql 9 Jun 2005 19:19:47 -0000 1.8 @@ -230,7 +230,7 @@ ); v_parameter_id:= nextval(''as_action_params_parameter_id''); -insert into as_action_params (parameter_id, action_id,type, varname, description,query) values (v_parameter_id,v_action_id,''q'',''community_id'',''Community to add the user'', ''select pretty_name,community_id from dotlrn_communities''); +insert into as_action_params (parameter_id, action_id,type, varname, description,query) values (v_parameter_id,v_action_id,''q'',''community_id'',''Community to add the user'', ''select pretty_name,community_id from dotlrn_communities where community_id in (select object_id from acs_permissions_all where grantee_id=:user_id)''); return v_action_id; end;' language 'plpgsql'; Index: openacs-4/packages/assessment/tcl/apm-callback-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/apm-callback-procs.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/assessment/tcl/apm-callback-procs.tcl 1 Feb 2005 22:13:44 -0000 1.2 +++ openacs-4/packages/assessment/tcl/apm-callback-procs.tcl 9 Jun 2005 19:19:47 -0000 1.3 @@ -97,3 +97,5 @@ } + + Index: openacs-4/packages/assessment/tcl/as-assessment-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-assessment-procs.tcl,v diff -u -r1.26 -r1.27 --- openacs-4/packages/assessment/tcl/as-assessment-procs.tcl 2 May 2005 10:11:22 -0000 1.26 +++ openacs-4/packages/assessment/tcl/as-assessment-procs.tcl 9 Jun 2005 19:19:47 -0000 1.27 @@ -553,3 +553,6 @@ return -1 } } + + + Index: openacs-4/packages/assessment/tcl/as-install-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-install-procs.tcl,v diff -u -r1.30 -r1.31 --- openacs-4/packages/assessment/tcl/as-install-procs.tcl 15 Apr 2005 17:26:45 -0000 1.30 +++ openacs-4/packages/assessment/tcl/as-install-procs.tcl 9 Jun 2005 19:19:47 -0000 1.31 @@ -18,6 +18,7 @@ } { inter_item_checks::apm_callback::package_install + content::type::new -content_type {as_item_choices} -supertype {content_revision} -pretty_name {Assessment Item Choice} -pretty_plural {Assessment Item Choices} -table_name {as_item_choices} -id_column {choice_id} content::type::new -content_type {as_item_sa_answers} -supertype {content_revision} -pretty_name {Assessment Item Answer} -pretty_plural {Assessment Item Answer} -table_name {as_item_sa_answers} -id_column {choice_id} @@ -357,5 +358,10 @@ 0.10d11 0.10d12 { content::type::attribute::new -content_type {as_items} -attribute_name {field_name} -datatype {string} -pretty_name {Item Field Name} -column_spec {varchar(500)} } + } } + + + + \ No newline at end of file Index: openacs-4/packages/assessment/www/admin/asm-action-param-admin.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/asm-action-param-admin.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/assessment/www/admin/asm-action-param-admin.tcl 6 May 2005 17:15:41 -0000 1.5 +++ openacs-4/packages/assessment/www/admin/asm-action-param-admin.tcl 9 Jun 2005 19:19:47 -0000 1.6 @@ -20,8 +20,8 @@ set context [list [list [export_vars -base asm-action-new {action_id} ] [_ assessment.action_admin] ] $page_title] +set user_id [ad_conn user_id] - set type_options [list [list "[_ assessment.query]" q] [list "[_ assessment.var ]" n]] @@ -46,11 +46,16 @@ } {action_id:text(hidden) {value $action_id}} -} -select_query_name {get_param_info} -new_data { +} -edit_request { + db_1row get_param_info {} +} -new_data { if { $type == "q" } { - set count_query_record [db_1row get_records "" ] - if { $count_query_record != 0 } { - db_dml insert_param {} + + set user_id [ad_conn user_id] + set count_query_record [db_list_of_lists get_records "$query" ] + + if { [llength $count_query_record] != 0 } { + db_dml insert_param {} } else { ad_script_abort } @@ -60,17 +65,20 @@ } -edit_data { if { $type == "q" } { - set count_query_record [db_1row get_records "" ] - if { $count_query_record != 0 } { - db_dml edit_param {} + set user_id [ad_conn user_id] + set count_query_record [db_list_of_lists get_records "$query" ] + + if { [llength $count_query_record] != 0 } { + db_dml edit_param {} } else { ad_script_abort } } else { db_dml edit_param {} } - - + + } -on_submit { + ad_returnredirect "asm-action-param-admin?action_id=$action_id" } Index: openacs-4/packages/assessment/www/admin/asm-action-param-admin.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/asm-action-param-admin.xql,v diff -u -r1.3 -r1.4 --- openacs-4/packages/assessment/www/admin/asm-action-param-admin.xql 14 Feb 2005 23:36:32 -0000 1.3 +++ openacs-4/packages/assessment/www/admin/asm-action-param-admin.xql 9 Jun 2005 19:19:47 -0000 1.4 @@ -29,11 +29,5 @@ - - - select count(*) from ($query) as query - - - Index: openacs-4/packages/assessment/www/asm-admin/action-params.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/action-params.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/assessment/www/asm-admin/action-params.tcl 7 Apr 2005 23:08:12 -0000 1.5 +++ openacs-4/packages/assessment/www/asm-admin/action-params.tcl 9 Jun 2005 19:19:47 -0000 1.6 @@ -19,6 +19,7 @@ } set package_id [ad_conn package_id] +set user_id [ad_conn user_id] permission::require_permission -object_id $package_id -privilege create permission::require_permission -object_id $assessment_id -privilege admin Index: openacs-4/packages/assessment/www/asm-admin/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/index.adp,v diff -u -r1.4 -r1.5 --- openacs-4/packages/assessment/www/asm-admin/index.adp 9 Feb 2005 10:58:47 -0000 1.4 +++ openacs-4/packages/assessment/www/asm-admin/index.adp 9 Jun 2005 19:19:48 -0000 1.5 @@ -1,5 +1,4 @@ -@title;noquote@ @context;noquote@ Index: openacs-4/packages/assessment/www/asm-admin/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/index.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/assessment/www/asm-admin/index.tcl 7 Apr 2005 21:22:51 -0000 1.6 +++ openacs-4/packages/assessment/www/asm-admin/index.tcl 9 Jun 2005 19:19:48 -0000 1.7 @@ -19,6 +19,7 @@ set package_id [ad_conn package_id] set categories_url [db_string get_category_url {}] set user_id [ad_conn user_id] +set sw_admin [acs_user::site_wide_admin_p -user_id $user_id] set package_admin_p [permission::permission_p -party_id $user_id -object_id $package_id -privilege "admin"] if { $package_admin_p == 0} { @@ -32,7 +33,11 @@ {zipfile:file {label "[_ assessment.Import_QTI_ZIP_File]"}} } -set actions [list "[_ assessment.New_Assessment]" assessment-form "[_ assessment.New_Assessment2]"] +if { $sw_admin } { + set actions [list "[_ assessment.New_Assessment]" assessment-form "[_ assessment.New_Assessment2]" [_ assessment.set_reg_asm] "../admin/set-reg-assessment" [_ assessment.set_reg_asm]] +} else { + set actions [list "[_ assessment.New_Assessment]" assessment-form "[_ assessment.New_Assessment2]"] +} if {[ad_permission_p [acs_magic_object "security_context_root"] "admin"]} { # lappend actions "[_ assessment.Admin_catalog]" "catalog/" "[_ assessment.Admin_catalog]" Index: openacs-4/packages/assessment/www/asm-admin/one-a.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/one-a.adp,v diff -u -r1.11 -r1.12 --- openacs-4/packages/assessment/www/asm-admin/one-a.adp 15 Apr 2005 18:15:48 -0000 1.11 +++ openacs-4/packages/assessment/www/asm-admin/one-a.adp 9 Jun 2005 19:19:48 -0000 1.12 @@ -81,7 +81,7 @@ -
#acs-subsite.set_reg_asm# +
#acs-subsite.set_reg_asm# Index: openacs-4/packages/assessment/www/asm-admin/one-a.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/one-a.tcl,v diff -u -r1.9 -r1.10 --- openacs-4/packages/assessment/www/asm-admin/one-a.tcl 8 Apr 2005 23:04:23 -0000 1.9 +++ openacs-4/packages/assessment/www/asm-admin/one-a.tcl 9 Jun 2005 19:19:48 -0000 1.10 @@ -11,6 +11,8 @@ assessment_id:integer {context ""} {reg_p ""} + {asm_instance ""} + {reg_url ""} } set is_reg_asm_p "" set package_id [ad_conn package_id] @@ -24,12 +26,17 @@ set context [list [list index [_ assessment.admin]] $assessment_data(title)] set assessment_rev_id $assessment_data(assessment_rev_id) -set subsite_id [ad_conn subsite_id] +set subsite_id [subsite::main_site_id] set url [apm_package_url_from_id $subsite_id] set anonymous_p [db_string has_privilege {} -default "f"] set read_p [permission::permission_p -object_id $assessment_id -privilege read -party_id -1] set value [parameter::get -parameter AsmForRegisterId -package_id $subsite_id] +if { [exists_and_not_null asm_instance]} { + set reg_url "[apm_package_url_from_id $asm_instance]admin" +} else { + set reg_url "../admin" +} if { [string eq $assessment_id $value] } { set is_reg_asm_p "[_ assessment.reg_asm]" }