Index: openacs-4/contrib/packages/simulation/sql/postgresql/simulation-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/sql/postgresql/Attic/simulation-drop.sql,v diff -u -r1.12 -r1.13 --- openacs-4/contrib/packages/simulation/sql/postgresql/simulation-drop.sql 1 Dec 2003 14:10:44 -0000 1.12 +++ openacs-4/contrib/packages/simulation/sql/postgresql/simulation-drop.sql 1 Dec 2003 14:50:33 -0000 1.13 @@ -193,12 +193,12 @@ begin perform acs_privilege__remove_child(''sim_admin'',''sim_template_create''); perform acs_privilege__remove_child(''sim_admin'',''sim_inst''); - perform acs_privilege__remove_child(''sim_admin'',''sim_object_create''); - perform acs_privilege__remove_child(''sim_admin'',''sim_object_write''); + perform acs_privilege__remove_child(''sim_admin'',''sim_object_writer''); perform acs_privilege__remove_child(''sim_admin'',''sim_set_map_p''); + perform acs_privilege__remove_child(''sim_object_writer'',''sim_object_create''); + perform acs_privilege__remove_child(''sim_object_writer'',''sim_object_write''); + perform acs_privilege__remove_child(''admin'',''sim_admin''); - perform acs_privilege__drop_privilege(''sim_admin''); - return null; end;' language 'plpgsql'; 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.2 -r1.3 --- openacs-4/contrib/packages/simulation/sql/postgresql/simulation-privs-create.sql 1 Dec 2003 14:10:44 -0000 1.2 +++ openacs-4/contrib/packages/simulation/sql/postgresql/simulation-privs-create.sql 1 Dec 2003 14:50:33 -0000 1.3 @@ -1,9 +1,8 @@ -- privileges -select acs_privilege__create_privilege('sim_admin','Simulation Admin',null); - --- add children +select acs_privilege__add_child('admin','sim_admin'); select acs_privilege__add_child('sim_admin','sim_template_create'); select acs_privilege__add_child('sim_admin','sim_inst'); -select acs_privilege__add_child('sim_admin','sim_object_create'); -select acs_privilege__add_child('sim_admin','sim_object_write'); select acs_privilege__add_child('sim_admin','sim_set_map_p'); +select acs_privilege__add_child('sim_admin','sim_object_writer'); +select acs_privilege__add_child('sim_object_writer','sim_object_create'); +select acs_privilege__add_child('sim_object_writer','sim_object_write'); Index: openacs-4/packages/simulation/sql/postgresql/simulation-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/sql/postgresql/simulation-drop.sql,v diff -u -r1.12 -r1.13 --- openacs-4/packages/simulation/sql/postgresql/simulation-drop.sql 1 Dec 2003 14:10:44 -0000 1.12 +++ openacs-4/packages/simulation/sql/postgresql/simulation-drop.sql 1 Dec 2003 14:50:33 -0000 1.13 @@ -193,12 +193,12 @@ begin perform acs_privilege__remove_child(''sim_admin'',''sim_template_create''); perform acs_privilege__remove_child(''sim_admin'',''sim_inst''); - perform acs_privilege__remove_child(''sim_admin'',''sim_object_create''); - perform acs_privilege__remove_child(''sim_admin'',''sim_object_write''); + perform acs_privilege__remove_child(''sim_admin'',''sim_object_writer''); perform acs_privilege__remove_child(''sim_admin'',''sim_set_map_p''); + perform acs_privilege__remove_child(''sim_object_writer'',''sim_object_create''); + perform acs_privilege__remove_child(''sim_object_writer'',''sim_object_write''); + perform acs_privilege__remove_child(''admin'',''sim_admin''); - perform acs_privilege__drop_privilege(''sim_admin''); - return null; end;' language 'plpgsql'; Index: openacs-4/packages/simulation/sql/postgresql/simulation-privs-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/sql/postgresql/simulation-privs-create.sql,v diff -u -r1.2 -r1.3 --- openacs-4/packages/simulation/sql/postgresql/simulation-privs-create.sql 1 Dec 2003 14:10:44 -0000 1.2 +++ openacs-4/packages/simulation/sql/postgresql/simulation-privs-create.sql 1 Dec 2003 14:50:33 -0000 1.3 @@ -1,9 +1,8 @@ -- privileges -select acs_privilege__create_privilege('sim_admin','Simulation Admin',null); - --- add children +select acs_privilege__add_child('admin','sim_admin'); select acs_privilege__add_child('sim_admin','sim_template_create'); select acs_privilege__add_child('sim_admin','sim_inst'); -select acs_privilege__add_child('sim_admin','sim_object_create'); -select acs_privilege__add_child('sim_admin','sim_object_write'); select acs_privilege__add_child('sim_admin','sim_set_map_p'); +select acs_privilege__add_child('sim_admin','sim_object_writer'); +select acs_privilege__add_child('sim_object_writer','sim_object_create'); +select acs_privilege__add_child('sim_object_writer','sim_object_write');