Index: openacs-4/packages/calendar/sql/postgresql/cal-table-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/sql/postgresql/cal-table-create.sql,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/calendar/sql/postgresql/cal-table-create.sql 5 Sep 2001 09:24:00 -0000 1.2 +++ openacs-4/packages/calendar/sql/postgresql/cal-table-create.sql 5 Sep 2001 09:44:59 -0000 1.3 @@ -59,8 +59,8 @@ time_zone integer constraint cal_pty_prefs_time_zone_fk --references timezones - --on delete cascade, - check (daily_end < 24 and daily_end > 0), + --on delete cascade + check (time_zone > 0), -- which day to start the week, monday or sunday first_day_of_week varchar(9) default 'Sunday' Index: openacs-4/packages/calendar/sql/postgresql/calendar-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/sql/postgresql/calendar-create.sql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/calendar/sql/postgresql/calendar-create.sql 24 Aug 2001 01:10:04 -0000 1.1 +++ openacs-4/packages/calendar/sql/postgresql/calendar-create.sql 5 Sep 2001 09:44:59 -0000 1.2 @@ -16,65 +16,60 @@ -- 3. write: edit an existing cal_item -- 4. delete: can delete the cal_item -- 5. invite: can allow other parties to view or edit the cal_item -CREATE FUNCTION inline_0 () -RETURNS integer -AS 'begin - PERFORM acs_privilege__create_privilege(''cal_item_create'', ''Add an new item'', null); - PERFORM acs_privilege__create_privilege(''cal_item_read'', ''view an cal_item'', null); - PERFORM acs_privilege__create_privilege(''cal_item_write'', ''Edit an exsiting cal_item'', null); - PERFORM acs_privilege__create_privilege(''cal_item_delete'', ''Delete cal_item'', null ); - PERFORM acs_privilege__create_privilege(''cal_item_invite'', ''Allow others to view cal_item'', null); - PERFORM acs_privilege__add_child(''create'', ''cal_item_create''); - PERFORM acs_privilege__add_child(''read'', ''cal_item_read''); - PERFORM acs_privilege__add_child(''write'', ''cal_item_write''); - PERFORM acs_privilege__add_child(''delete'', ''cal_item_delete''); - PERFORM acs_privilege__create_privilege(''calendar_on'', ''Implies that a calendar is selected'', null); - PERFORM acs_privilege__create_privilege(''calendar_show'', ''Show a calendar'', null); + select acs_privilege__create_privilege('cal_item_create', 'Add an new item', null); + select acs_privilege__create_privilege('cal_item_read', 'view an +cal_item', null); + select acs_privilege__create_privilege('cal_item_write', 'Edit an exsiting cal_item', null); + select acs_privilege__create_privilege('cal_item_delete', 'Delete cal_item', null ); + select acs_privilege__create_privilege('cal_item_invite', 'Allow others to view cal_item', null); - PERFORM acs_privilege__add_child(''read'', ''calendar_on''); - PERFORM acs_privilege__add_child(''read'', ''calendar_show''); + select acs_privilege__add_child('create', 'cal_item_create'); + select acs_privilege__add_child('read', 'cal_item_read'); + select acs_privilege__add_child('write', 'cal_item_write'); - PERFORM acs_privilege__create_privilege(''calendar_create'', ''Create a new calendar'', null); - PERFORM acs_privilege__create_privilege(''calendar_read'', ''View items on an exsiting calendar'', null); - PERFORM acs_privilege__create_privilege(''calendar_write'', ''Edit items of an exsiting calendar'', null); - PERFORM acs_privilege__create_privilege(''calendar_delete'',''Delete an calendar'', null); + select acs_privilege__add_child('delete', 'cal_item_delete'); + + select acs_privilege__create_privilege('calendar_on', 'Implies that a +calendar is selected', null); + select acs_privilege__create_privilege('calendar_show', 'Show a calendar', null); + select acs_privilege__add_child('read', 'calendar_on'); + select acs_privilege__add_child('read', 'calendar_show'); + + select acs_privilege__create_privilege('calendar_create', 'Create a new +calendar', null); + select acs_privilege__create_privilege('calendar_read', 'View items on +an exsiting calendar', null); + select acs_privilege__create_privilege('calendar_write', 'Edit items of +an exsiting calendar', null); + select acs_privilege__create_privilege('calendar_delete','Delete an calendar', null); - PERFORM acs_privilege__add_child(''create'', ''calendar_create''); - PERFORM acs_privilege__add_child(''read'', ''calendar_read''); - PERFORM acs_privilege__add_child(''write'', ''calendar_write''); - PERFORM acs_privilege__add_child(''delete'', ''calendar_delete''); + select acs_privilege__add_child('create', 'calendar_create'); + select acs_privilege__add_child('read', 'calendar_read'); + select acs_privilege__add_child('write', 'calendar_write'); + select acs_privilege__add_child('delete', 'calendar_delete'); - - PERFORM acs_privilege__add_child(''calendar_create'', ''cal_item_create''); - PERFORM acs_privilege__add_child(''calendar_read'', ''cal_item_read''); - PERFORM acs_privilege__add_child(''calendar_write'', ''cal_item_write''); - PERFORM acs_privilege__add_child(''calendar_delete'', ''cal_item_delete''); + select acs_privilege__add_child('calendar_create', 'cal_item_create'); + select acs_privilege__add_child('calendar_read', 'cal_item_read'); + select acs_privilege__add_child('calendar_write', 'cal_item_write'); + select acs_privilege__add_child('calendar_delete', 'cal_item_delete'); - PERFORM acs_privilege__create_privilege(''calendar_admin'', ''calendar adminstrator'', null); - PERFORM acs_privilege__add_child(''admin'', ''calendar_admin''); - PERFORM acs_privilege__add_child(''calendar_admin'', ''calendar_read''); - PERFORM acs_privilege__add_child(''calendar_admin'', ''calendar_write''); - PERFORM acs_privilege__add_child(''calendar_admin'', ''calendar_delete''); - PERFORM acs_privilege__add_child(''calendar_admin'', ''calendar_create''); - PERFORM acs_privilege__add_child(''calendar_admin'', ''cal_item_invite''); + select acs_privilege__create_privilege('calendar_admin', 'calendar adminstrator', null); + select acs_privilege__add_child('admin', 'calendar_admin'); + select acs_privilege__add_child('calendar_admin', 'calendar_read'); + select acs_privilege__add_child('calendar_admin', 'calendar_write'); + select acs_privilege__add_child('calendar_admin', 'calendar_delete'); + select acs_privilege__add_child('calendar_admin', 'calendar_create'); + select acs_privilege__add_child('calendar_admin', 'cal_item_invite'); - return 0; - end;' -LANGUAGE 'plpgsql'; - -SELECT inline_0 (); - -drop function inline_0 (); - ---------------------------------------------------------- -- calendar_ojbect ----------------------------------------------------------- -CREATE FUNCTION inline_1() +CREATE FUNCTION inline_0() RETURNS integer AS 'declare attr_id acs_attributes.attribute_id%TYPE; @@ -145,9 +140,9 @@ end;' LANGUAGE 'plpgsql'; -SELECT inline_1(); +SELECT inline_0(); -DROP function inline_1(); +DROP function inline_0(); --begin -- create the calendar object @@ -257,7 +252,7 @@ -- Load cal_item_object ------------------------------------------------------------- --@@cal-item-create -\i cal-item-create.sql +--\i cal-item-create.sql ------------------------------------------------------------- -- create package calendar ------------------------------------------------------------- @@ -907,6 +902,7 @@ ----------------------------------------------------------------- -- load related sql files ----------------------------------------------------------------- +--\i cal-item-create.sql -- --@@cal-table-create \i cal-table-create.sql