Index: openacs-4/packages/acs-kernel/sql/oracle/acs-relationships-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/oracle/acs-relationships-create.sql,v diff -u -r1.16.2.1 -r1.16.2.2 --- openacs-4/packages/acs-kernel/sql/oracle/acs-relationships-create.sql 12 Feb 2022 20:13:54 -0000 1.16.2.1 +++ openacs-4/packages/acs-kernel/sql/oracle/acs-relationships-create.sql 13 Feb 2022 13:21:25 -0000 1.16.2.2 @@ -131,7 +131,8 @@ object_type_two in acs_rel_types.object_type_two%TYPE, role_two in acs_rel_types.role_two%TYPE default null, min_n_rels_two in acs_rel_types.min_n_rels_two%TYPE, - max_n_rels_two in acs_rel_types.max_n_rels_two%TYPE + max_n_rels_two in acs_rel_types.max_n_rels_two%TYPE, + composable_p in char default 't' ); procedure drop_type ( @@ -215,7 +216,8 @@ object_type_two in acs_rel_types.object_type_two%TYPE, role_two in acs_rel_types.role_two%TYPE default null, min_n_rels_two in acs_rel_types.min_n_rels_two%TYPE, - max_n_rels_two in acs_rel_types.max_n_rels_two%TYPE + max_n_rels_two in acs_rel_types.max_n_rels_two%TYPE, + composable_p in char default 't' ) is begin @@ -237,13 +239,15 @@ object_type_one, role_one, min_n_rels_one, max_n_rels_one, object_type_two, role_two, - min_n_rels_two, max_n_rels_two) + min_n_rels_two, max_n_rels_two, + composable_p) values (create_type.rel_type, create_type.object_type_one, create_type.role_one, create_type.min_n_rels_one, create_type.max_n_rels_one, create_type.object_type_two, create_type.role_two, - create_type.min_n_rels_two, create_type.max_n_rels_two); + create_type.min_n_rels_two, create_type.max_n_rels_two, + create_type.composable_p); end; procedure drop_type ( Index: openacs-4/packages/acs-kernel/sql/oracle/groups-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/oracle/groups-create.sql,v diff -u -r1.13.2.1 -r1.13.2.2 --- openacs-4/packages/acs-kernel/sql/oracle/groups-create.sql 12 Apr 2020 08:52:42 -0000 1.13.2.1 +++ openacs-4/packages/acs-kernel/sql/oracle/groups-create.sql 13 Feb 2022 13:21:25 -0000 1.13.2.2 @@ -100,8 +100,8 @@ acs_rel_type.create_type ( rel_type => 'membership_rel', - pretty_name => 'Membership Relation', - pretty_plural => 'Membership Relationships', + pretty_name => '#acs-kernel.Membership_Relation#', + pretty_plural => '#acs-kernel.lt_Membership_Relationsh#', table_name => 'membership_rels', id_column => 'rel_id', package_name => 'membership_rel', @@ -116,8 +116,8 @@ acs_rel_type.create_type ( rel_type => 'admin_rel', - pretty_name => 'Administrator Relation', - pretty_plural => 'Administrator Relationships', + pretty_name => '#acs-kernel.lt_Administrator_Relatio#', + pretty_plural => '#acs-kernel.lt_Administrator_Relatio_1#', supertype => 'membership_rel', table_name => 'admin_rels', id_column => 'rel_id',