Index: openacs-4/contrib/packages/portal/sql/oracle/layout-package-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/sql/oracle/layout-package-create.sql,v diff -u -r1.1 -r1.2 --- openacs-4/contrib/packages/portal/sql/oracle/layout-package-create.sql 25 Oct 2002 21:29:17 -0000 1.1 +++ openacs-4/contrib/packages/portal/sql/oracle/layout-package-create.sql 25 Sep 2003 02:12:15 -0000 1.2 @@ -39,6 +39,11 @@ p_context_id in acs_objects.context_id%TYPE default null ) return portal_layouts.layout_id%TYPE; + procedure add_region ( + p_layout_id in portal_layout_regions.layout_id%TYPE, + p_region in portal_layout_regions.region%TYPE + ); + procedure delete ( p_layout_id in portal_layouts.layout_id%TYPE ); @@ -84,6 +89,19 @@ end new; + procedure add_region ( + p_layout_id in portal_layout_regions.layout_id%TYPE, + p_region in portal_layout_regions.region%TYPE + ) + is + begin + insert into portal_layout_regions + (layout_id, region) + values + (p_layout_id, p_region); + end add_region; + + procedure delete ( p_layout_id in portal_layouts.layout_id%TYPE ) Index: openacs-4/contrib/packages/portal/sql/postgresql/datasource-package-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/sql/postgresql/datasource-package-create.sql,v diff -u -r1.1 -r1.2 --- openacs-4/contrib/packages/portal/sql/postgresql/datasource-package-create.sql 25 Oct 2002 21:29:17 -0000 1.1 +++ openacs-4/contrib/packages/portal/sql/postgresql/datasource-package-create.sql 25 Sep 2003 02:12:16 -0000 1.2 @@ -96,7 +96,7 @@ insert into portal_datasource_parameters (parameter_id, datasource_id, config_required_p, configured_p, key, value) values - (portal_seq.nextval, p_datasource_id, p_config_required_p, p_configured_p, p_key, p_value); + (nextval(''portal_seq''), p_datasource_id, p_config_required_p, p_configured_p, p_key, p_value); return 0; Index: openacs-4/contrib/packages/portal/sql/postgresql/defaults.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/sql/postgresql/Attic/defaults.sql,v diff -u -r1.1 -r1.2 --- openacs-4/contrib/packages/portal/sql/postgresql/defaults.sql 25 Oct 2002 21:29:17 -0000 1.1 +++ openacs-4/contrib/packages/portal/sql/postgresql/defaults.sql 25 Sep 2003 02:12:16 -0000 1.2 @@ -32,21 +32,33 @@ -- one-column layout, without a header. layout_id := portal_layout__new( - ''1_column'', - ''A simple 1-column layout'', - ''layouts/simple1'', - ''layouts/components/simple1'' + null, -- layout_id + ''1_column'', -- name + ''A simple 1-column layout'', -- description + ''layouts/simple1'', -- filename + ''layouts/components/simple1'', -- resource_dir + null, -- object_type + null, -- creation_date + null, -- creation_user + null, -- creation_ip + null -- context_id ); -- the supported regions for that layout. perform portal_layout__add_region(layout_id, ''1''); -- two-column layout, without a header. layout_id := portal_layout__new( - ''2_column'', - ''A simple 2-column layout'', - ''layouts/simple2'', - ''layouts/components/simple2'' + null, -- layout_id + ''2_column'', -- name + ''A simple 2-column layout'', -- description + ''layouts/simple2'', -- filename + ''layouts/components/simple2'', -- resource_dir + null, -- object_type + null, -- creation_date + null, -- creation_user + null, -- creation_ip + null -- context_id ); -- the supported regions for that layout. @@ -55,10 +67,16 @@ -- same as above, only, three columns. layout_id := portal_layout__new( - ''3_column'', - ''A simple 3-column layout'', - ''layouts/simple3'', - ''layouts/components/simple3'' + null, -- layout_id + ''3_column'', -- name + ''A simple 3-column layout'', -- description + ''layouts/simple3'', -- filename + ''layouts/components/simple3'', -- resource_dir + null, -- object_type + null, -- creation_date + null, -- creation_user + null, -- creation_ip + null -- context_id ); perform portal_layout__add_region(layout_id, ''1''); Index: openacs-4/contrib/packages/portal/sql/postgresql/layout-package-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/sql/postgresql/layout-package-create.sql,v diff -u -r1.1 -r1.2 --- openacs-4/contrib/packages/portal/sql/postgresql/layout-package-create.sql 25 Oct 2002 21:29:17 -0000 1.1 +++ openacs-4/contrib/packages/portal/sql/postgresql/layout-package-create.sql 25 Sep 2003 02:12:16 -0000 1.2 @@ -25,26 +25,30 @@ select define_function_args('portal_layout__new', 'layout_id,name,description,filename,resource_dir,object_type;portal_layout,creation_date,creation_user,creation_ip,context_id'); -create or replace function portal_layout__new (integer,varchar,varchar,varchar,varchar,varchar,timestamp,integer,varchar,integer) +create or replace function portal_layout__new (integer,varchar,varchar,varchar,varchar,varchar,timestamptz,integer,varchar,integer) returns integer as ' declare - p_layout_id alias for $1; + p_layout_id alias for $1; -- default null p_name alias for $2; - p_description alias for $3; + p_description alias for $3; -- default null p_filename alias for $4; p_resource_dir alias for $5; - p_object_type alias for $6; - p_creation_date alias for $7; - p_creation_user alias for $8; - p_creation_ip alias for $9; - p_context_id alias for $10; + p_object_type alias for $6; -- default ''portal_layout'' + p_creation_date alias for $7; -- default current_timestamp + p_creation_user alias for $8; -- default null + p_creation_ip alias for $9; -- default null + p_context_id alias for $10; -- default null v_layout_id portal_layouts.layout_id%TYPE; + v_object_type acs_objects.object_type%TYPE; + v_creation_date acs_objects.creation_date%TYPE; begin + v_object_type = coalesce(p_object_type, ''portal_layout''); + v_creation_date = coalesce(p_creation_date, current_timestamp); v_layout_id := acs_object__new( p_layout_id, - p_object_type, - p_creation_date, + v_object_type, + v_creation_date, p_creation_user, p_creation_ip, p_context_id, @@ -60,10 +64,28 @@ end;' language 'plpgsql'; +select define_function_args('portal_layout__add_region', 'layout_id,region'); + +create or replace function portal_layout__add_region(integer,varchar) +returns integer as ' +declare + p_layout_id alias for $1; + p_region alias for $2; +begin + insert into portal_layout_regions + (layout_id, region) + values + (p_layout_id, p_region); + + return 0; +end;' language 'plpgsql'; + + select define_function_args('portal_layout__delete', 'layout_id'); create or replace function portal_layout__delete (integer) returns integer as ' +declare p_layout_id alias for $1; begin Index: openacs-4/contrib/packages/portal/sql/postgresql/page-package-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/sql/postgresql/page-package-create.sql,v diff -u -r1.1 -r1.2 --- openacs-4/contrib/packages/portal/sql/postgresql/page-package-create.sql 25 Oct 2002 21:29:17 -0000 1.1 +++ openacs-4/contrib/packages/portal/sql/postgresql/page-package-create.sql 25 Sep 2003 02:12:16 -0000 1.2 @@ -25,7 +25,7 @@ select define_function_args('portal_page__new', 'page_id,name,portal_id,layout_id,object_type;portal_page,creation_date,creation_user,creation_ip,context_id'); -create or replace function portal_page__new (integer,varchar,integer,integer,varchar,timestamp,integer,varchar,integer) +create or replace function portal_page__new (integer,varchar,integer,integer,varchar,timestamptz,integer,varchar,integer) returns integer as ' declare p_page_id alias for $1; Index: openacs-4/contrib/packages/portal/sql/postgresql/portal-core-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/sql/postgresql/portal-core-create.sql,v diff -u -r1.1 -r1.2 --- openacs-4/contrib/packages/portal/sql/postgresql/portal-core-create.sql 25 Oct 2002 21:29:17 -0000 1.1 +++ openacs-4/contrib/packages/portal/sql/postgresql/portal-core-create.sql 25 Sep 2003 02:12:16 -0000 1.2 @@ -47,7 +47,7 @@ description varchar(200) ); -comment on table portal_datasources ' +comment on table portal_datasources is ' '; create table portal_datasource_parameters ( @@ -78,7 +78,7 @@ ); -comment on table portal_datasource_parameters ' +comment on table portal_datasource_parameters is ' maintains a set of default parameters for portal datsources. these are copied to a portal element when it is created. @@ -100,15 +100,15 @@ | | default is provided. '; -comment on column portal_datasource_parameters.config_required_p ' +comment on column portal_datasource_parameters.config_required_p is ' this parameter requires configuration. if configured_p is true then no action is needed at portal element creation since the portal element can simply use the default value provided. if configured_p is false then the portal element must provide a value for this parameter at creation time. '; -comment on column portal_datasource_parameters.configured_p ' +comment on column portal_datasource_parameters.configured_p is ' if true then a default value is provided for this parameter. '; @@ -128,13 +128,13 @@ resource_dir varchar(200) ); -comment on table portal_layouts ' +comment on table portal_layouts is ' '; -comment on column portal_layouts.filename ' +comment on column portal_layouts.filename is ' '; -comment on column portal_layouts.resource_dir ' +comment on column portal_layouts.resource_dir is ' '; create table portal_layout_regions ( @@ -151,10 +151,10 @@ primary key (layout_id, region) ); -comment on table portal_layout_regions ' +comment on table portal_layout_regions is ' '; -comment on column portal_layout_regions.region ' +comment on column portal_layout_regions.region is ' '; -- Themes are templates with decoration for PEs, nothing more. @@ -175,13 +175,13 @@ resource_dir varchar(200) ); -comment on table portal_themes ' +comment on table portal_themes is ' '; -comment on column portal_themes.filename ' +comment on column portal_themes.filename is ' '; -comment on column portal_themes.resource_dir ' +comment on column portal_themes.resource_dir is ' '; -- Portals are essentially "containers" for PEs that bind to DSs. @@ -208,10 +208,10 @@ references portals (portal_id) ); -comment on table portals ' +comment on table portals is ' '; -comment on column portals.template_id ' +comment on column portals.template_id is ' '; create table portal_pages ( @@ -243,10 +243,10 @@ create index portal_pages_prtl_page_idx on portal_pages (portal_id, page_id); -comment on table portal_pages ' +comment on table portal_pages is ' '; -comment on column portal_pages.sort_key ' +comment on column portal_pages.sort_key is ' '; -- Support for multi-page portals (think my.yahoo.com) @@ -305,13 +305,13 @@ unique (page_id, name) ); -comment on table portal_elements ' +comment on table portal_elements is ' '; -comment on column portal_elements.sort_key ' +comment on column portal_elements.sort_key is ' '; -comment on column portal_elements.state ' +comment on column portal_elements.state is ' '; create table portal_element_parameters ( @@ -344,11 +344,11 @@ create index p_element_params_element_key_idx on portal_element_parameters (element_id, key); -comment on table portal_element_parameters ' +comment on table portal_element_parameters is ' '; -comment on column portal_element_parameters.config_required_p ' +comment on column portal_element_parameters.config_required_p is ' '; -comment on column portal_element_parameters.configured_p ' +comment on column portal_element_parameters.configured_p is ' '; Index: openacs-4/contrib/packages/portal/sql/postgresql/portal-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/sql/postgresql/portal-create.sql,v diff -u -r1.1 -r1.2 --- openacs-4/contrib/packages/portal/sql/postgresql/portal-create.sql 25 Oct 2002 21:29:17 -0000 1.1 +++ openacs-4/contrib/packages/portal/sql/postgresql/portal-create.sql 25 Sep 2003 02:12:16 -0000 1.2 @@ -23,12 +23,12 @@ -- @version $Id$ -- -\i portal-core-create.sql; -\i objects-create.sql; -\i page-package-create.sql; -\i portal-package-create.sql; -\i theme-package-create.sql; -\i layout-package-create.sql; -\i datasource-package-create.sql; -\i datasource-sc-create.sql; -\i defaults.sql; +\i portal-core-create.sql +\i objects-create.sql +\i page-package-create.sql +\i portal-package-create.sql +\i theme-package-create.sql +\i layout-package-create.sql +\i datasource-package-create.sql +\i datasource-sc-create.sql +\i defaults.sql Index: openacs-4/contrib/packages/portal/sql/postgresql/portal-package-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/sql/postgresql/portal-package-create.sql,v diff -u -r1.1 -r1.2 --- openacs-4/contrib/packages/portal/sql/postgresql/portal-package-create.sql 25 Oct 2002 21:29:17 -0000 1.1 +++ openacs-4/contrib/packages/portal/sql/postgresql/portal-package-create.sql 25 Sep 2003 02:12:16 -0000 1.2 @@ -25,7 +25,7 @@ select define_function_args('portal__new', 'portal_id,name,theme_id,template_id,object_type;portal,creation_date,creation_user,creation_ip,context_id'); -create or replace function portal__new (integer,varchar,integer,integer,varchar,timestamp,integer,varchar,integer) +create or replace function portal__new (integer,varchar,integer,integer,varchar,timestamptz,integer,varchar,integer) returns integer as ' declare p_portal_id alias for $1; @@ -113,7 +113,7 @@ where page_id = v_page.page_id loop - select portal_seq.nextval + select nextval(''portal_seq'') into v_new_element_id from dual; @@ -130,7 +130,7 @@ where element_id = v_element.element_id loop - select portal_seq.nextval + select nextval(''portal_seq'') into v_new_parameter_id from dual; Index: openacs-4/contrib/packages/portal/sql/postgresql/theme-package-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/sql/postgresql/theme-package-create.sql,v diff -u -r1.1 -r1.2 --- openacs-4/contrib/packages/portal/sql/postgresql/theme-package-create.sql 25 Oct 2002 21:29:17 -0000 1.1 +++ openacs-4/contrib/packages/portal/sql/postgresql/theme-package-create.sql 25 Sep 2003 02:12:16 -0000 1.2 @@ -25,7 +25,7 @@ select define_function_args('portal_theme__new', 'theme_id,name,description,filename,resource_dir,object_type;portal_theme,creation_date,creation_user,creation_ip,context_id'); -create or replace function portal_theme__new (integer,varchar,varchar,varchar,varchar,varchar,timestamp,integer,varchar,integer) +create or replace function portal_theme__new (integer,varchar,varchar,varchar,varchar,varchar,timestamptz,integer,varchar,integer) returns integer as ' declare p_theme_id alias for $1; Index: openacs-4/contrib/packages/portal/www/admin/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/www/admin/index.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/contrib/packages/portal/www/admin/index.tcl 25 Oct 2002 21:29:17 -0000 1.1 +++ openacs-4/contrib/packages/portal/www/admin/index.tcl 25 Sep 2003 02:12:16 -0000 1.2 @@ -24,7 +24,7 @@ } { } -permission::require -object_id [ad_conn package_id] -privilege admin +permission::require_permission -object_id [ad_conn package_id] -privilege admin set query "select portal_id, name, template_id