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.7 -r1.8 --- openacs-4/contrib/packages/simulation/lib/sim-templates.tcl 2 Dec 2003 13:46:53 -0000 1.7 +++ openacs-4/contrib/packages/simulation/lib/sim-templates.tcl 2 Dec 2003 17:29:48 -0000 1.8 @@ -17,6 +17,7 @@ set package_id [ad_conn package_id] set add_url [export_vars -base "[apm_package_url_from_id $package_id]simbuild/template-edit" ] +set create_p [permission::permission_p -object_id $package_id -privilege sim_template_create] # TODO: make this include honor the display_mode parameter @@ -48,10 +49,13 @@ -elements { edit { sub_class narrow - link_url_col edit_url - display_template { - Edit - } + display_template { + + + Edit + + + } } name { label "Name" @@ -74,12 +78,14 @@ } delete { sub_class narrow - display_template { - + Delete - - } + + + } } clone { display_template { @@ -101,7 +107,7 @@ # ###################################################################### -db_multirow -extend { edit_url view_url delete_url clone_url } sim_templates select_sim_templates " +db_multirow -extend { edit_url view_url delete_url clone_url edit_p } sim_templates select_sim_templates " select w.workflow_id, w.pretty_name as name, 'placeholder' as description, @@ -128,4 +134,6 @@ set delete_url [export_vars -base "[apm_package_url_from_id $package_id]simbuild/template-delete" {workflow_id} ] set clone_url [export_vars -base "[apm_package_url_from_id $package_id]simbuild/template-clone" {workflow_id} ] + + set edit_p [permission::write_permission_p -object_id $workflow_id] } Index: openacs-4/contrib/packages/simulation/lib/yellow-pages.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/lib/Attic/yellow-pages.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/contrib/packages/simulation/lib/yellow-pages.adp 2 Dec 2003 17:29:48 -0000 1.1 @@ -0,0 +1,2 @@ +

+TODO: modify query to use object_type pretty_name Index: openacs-4/contrib/packages/simulation/lib/yellow-pages.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/lib/Attic/yellow-pages.tcl,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/contrib/packages/simulation/lib/yellow-pages.tcl 2 Dec 2003 17:29:48 -0000 1.1 @@ -0,0 +1,86 @@ +simulation::include_contract { + Displays a list of simulation objects in the directory for the current simulation package instance. + This was formerly a mode of the sim-objects includelet but it is different enough to be + broken out. + + @author Joel Aufrecht + @creation-date 2003-11-12 + @cvs-id $Id: yellow-pages.tcl,v 1.1 2003/12/02 17:29:48 joela Exp $ +} + +###################################################################### +# Set general variables + +set package_id [ad_conn package_id] + +if { ![exists_and_not_null user_id] } { + set user_id [auth::get_user_id] +} + +###################################################################### +# +# objects list +# +###################################################################### + +#--------------------------------------------------------------------- +# Set basic elements list +set elements { + object_type { + label "Type" + orderby upper(ot.pretty_name) + } + title { + label "Name" + orderby r.title + link_url_col view_url + } + description { + label "Description" + orderby r.description + } +} + +#--------------------------------------------------------------------- +# +template::list::create \ + -name objects \ + -multirow objects \ + -elements $elements + +#--------------------------------------------------------------------- +# database query + +db_multirow -extend {view_url} objects select_objects " + select sl.object_id, + sl.object_type, + sl.title, + sl.mime_type, + sl.name, + sl.item_id, + sl.description + from sim_locationsx sl + where in_directory_p = 't' + UNION + select sc.object_id, + sc.object_type, + sc.title, + sc.mime_type, + sc.name, + sc.item_id, + sc.description + from sim_charactersx sc + where in_directory_p = 't' + + [template::list::orderby_clause -orderby -name "objects"] +" { + set description [string_truncate -len 200 $description] + switch -glob $mime_type { + text/* - {} { + set view_url [simulation::object::url -name $name] + } + default { + set view_url [simulation::object::content_url -name $name] + } + } +} Index: openacs-4/contrib/packages/simulation/sql/postgresql/simulation-priv-test-users-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/sql/postgresql/Attic/simulation-priv-test-users-create.sql,v diff -u -r1.1 -r1.2 --- openacs-4/contrib/packages/simulation/sql/postgresql/simulation-priv-test-users-create.sql 2 Dec 2003 13:46:53 -0000 1.1 +++ openacs-4/contrib/packages/simulation/sql/postgresql/simulation-priv-test-users-create.sql 2 Dec 2003 17:29:48 -0000 1.2 @@ -1,4 +1,4 @@ --- create dummy users for permissions testing +1-- create dummy users for permissions testing -- create each user and then assign appropriate privs directly -- this is a temp solution - should instead create all the groups @@ -34,7 +34,6 @@ -- create CaseAuthor user and assign privs select acs_user__new(null,''user'',null,null,null,null,''cassie'' || random_seed,''email2'' || random_seed,null,''Cassie'',''CaseAuthor'',null,null,null,''t'',null) into user_id; - perform acs_permission__grant_permission(package_id,user_id,''sim_template_creator''); perform acs_permission__grant_permission(package_id,user_id,''sim_inst''); perform acs_permission__grant_permission(package_id,user_id,''sim_object_create''); Index: openacs-4/contrib/packages/simulation/sql/postgresql/simulation-privs-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/sql/postgresql/Attic/simulation-privs-create.sql,v diff -u -r1.5 -r1.6 --- openacs-4/contrib/packages/simulation/sql/postgresql/simulation-privs-create.sql 2 Dec 2003 13:46:53 -0000 1.5 +++ openacs-4/contrib/packages/simulation/sql/postgresql/simulation-privs-create.sql 2 Dec 2003 17:29:48 -0000 1.6 @@ -21,8 +21,8 @@ select acs_privilege__create_privilege('sim_template_read','Read Simulation Templates',null); select acs_privilege__create_privilege('sim_template_create','Create Simulation Templates',null); select acs_privilege__create_privilege('sim_template_creator','Create and Read Simulation Templates',null); -select acs_privilege__add_child('sim_admin_creator','sim_template_create'); -select acs_privilege__add_child('sim_admin_creator','sim_template_read'); +select acs_privilege__add_child('sim_template_creator','sim_template_create'); +select acs_privilege__add_child('sim_template_creator','sim_template_read'); select acs_privilege__add_child('sim_admin','sim_template_creator'); Index: openacs-4/contrib/packages/simulation/www/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/Attic/index.adp,v diff -u -r1.24 -r1.25 --- openacs-4/contrib/packages/simulation/www/index.adp 2 Dec 2003 13:46:53 -0000 1.24 +++ openacs-4/contrib/packages/simulation/www/index.adp 2 Dec 2003 17:24:32 -0000 1.25 @@ -34,7 +34,9 @@ + +

SimInst

Index: openacs-4/contrib/packages/simulation/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/Attic/index.tcl,v diff -u -r1.11 -r1.12 --- openacs-4/contrib/packages/simulation/www/index.tcl 2 Dec 2003 13:46:53 -0000 1.11 +++ openacs-4/contrib/packages/simulation/www/index.tcl 2 Dec 2003 17:24:32 -0000 1.12 @@ -12,7 +12,8 @@ set user_id [auth::get_user_id] set citybuild_p [permission::permission_p -object_id $package_id -privilege sim_object_create] -set simbuild_p [permission::permission_p -object_id $package_id -privilege sim_inst] +set simbuild_p [permission::permission_p -object_id $package_id -privilege sim_object_create] +set siminst_p [permission::permission_p -object_id $package_id -privilege sim_inst] ###################################################################### # Index: openacs-4/contrib/packages/simulation/www/object-xml.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/Attic/object-xml.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/contrib/packages/simulation/www/object-xml.tcl 7 Nov 2003 16:08:45 -0000 1.1 +++ openacs-4/contrib/packages/simulation/www/object-xml.tcl 2 Dec 2003 17:24:32 -0000 1.2 @@ -7,6 +7,8 @@ item_id:integer } +permission::require_permission -object_id $item_id -privilege sim_set_map_p + set flash_xml [simulation::object::generate_xml -item_id $item_id] ns_return 200 text/plain $flash_xml Index: openacs-4/contrib/packages/simulation/www/citybuild/generate-xml.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/citybuild/Attic/generate-xml.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/contrib/packages/simulation/www/citybuild/generate-xml.tcl 13 Nov 2003 14:55:26 -0000 1.1 +++ openacs-4/contrib/packages/simulation/www/citybuild/generate-xml.tcl 2 Dec 2003 17:24:32 -0000 1.2 @@ -6,7 +6,10 @@ set page_title "Generation of Map XML file" set context [list [list "." "CityBuild"] $page_title] +set package_id [ad_conn package_id] +permission::require_permission -object_id $package_id -privilege sim_set_map_p + array set result [simulation::object::xml::generate_file -package_id [ad_conn package_id]] set error_text [join $result(errors) "\n"] Index: openacs-4/contrib/packages/simulation/www/citybuild/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/citybuild/Attic/index.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/contrib/packages/simulation/www/citybuild/index.tcl 2 Dec 2003 13:46:53 -0000 1.3 +++ openacs-4/contrib/packages/simulation/www/citybuild/index.tcl 2 Dec 2003 17:24:32 -0000 1.4 @@ -8,15 +8,14 @@ {type:optional} } - set page_title "CityBuild" set context [list $page_title] set package_id [ad_conn package_id] permission::require_permission -object_id $package_id -privilege sim_object_create set admin_p [permission::permission_p -object_id $package_id -privilege admin] -set map_p [expr $admin_p ||[permission::permission_p -object_id $package_id -privilege sim_set_map_p]] +set map_p [permission::permission_p -object_id $package_id -privilege sim_set_map_p] set notification_widget [notification::display::request_widget \ -type [simulation::notification::xml_map::type_short_name] \ Index: openacs-4/contrib/packages/simulation/www/citybuild/map-xml.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/citybuild/Attic/map-xml.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/contrib/packages/simulation/www/citybuild/map-xml.tcl 13 Nov 2003 14:55:26 -0000 1.1 +++ openacs-4/contrib/packages/simulation/www/citybuild/map-xml.tcl 2 Dec 2003 17:24:32 -0000 1.2 @@ -4,4 +4,8 @@ @cvs-id $Id$ } +set package_id [ad_conn package_id] + +permission::require_permission -object_id $package_id -privilege sim_set_map_p + ns_return 200 text/plain [simulation::object::xml::get_doc] Index: openacs-4/contrib/packages/simulation/www/citybuild/object-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/citybuild/Attic/object-delete.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/contrib/packages/simulation/www/citybuild/object-delete.tcl 13 Nov 2003 14:55:26 -0000 1.1 +++ openacs-4/contrib/packages/simulation/www/citybuild/object-delete.tcl 2 Dec 2003 17:24:32 -0000 1.2 @@ -6,9 +6,8 @@ {return_url "."} } -permission::require_permission -object_id $item_id -privilege write - if { [template::util::is_true $confirm_p] } { + permission::require_write_permission -object_id $item_id bcms::item::delete_item -item_id $item_id ad_returnredirect $return_url } Index: openacs-4/contrib/packages/simulation/www/doc/permissions-table.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/doc/Attic/permissions-table.html,v diff -u -r1.7 -r1.8 --- openacs-4/contrib/packages/simulation/www/doc/permissions-table.html 2 Dec 2003 15:56:19 -0000 1.7 +++ openacs-4/contrib/packages/simulation/www/doc/permissions-table.html 2 Dec 2003 17:24:32 -0000 1.8 @@ -7,7 +7,7 @@ - +