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 @@
-
+