Index: openacs-4/packages/acs-kernel/sql/postgresql/groups-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/groups-create.sql,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-kernel/sql/postgresql/groups-create.sql 28 Apr 2001 17:35:30 -0000 1.8
+++ openacs-4/packages/acs-kernel/sql/postgresql/groups-create.sql 20 Aug 2001 21:52:31 -0000 1.9
@@ -134,7 +134,8 @@
constraint group_types_pk primary key
constraint group_types_obj_type_fk
references acs_object_types (object_type),
- approval_policy varchar(30) not null,
+ -- commented out by Ben (OpenACS), to make it in sync with Oracle version..
+ -- approval_policy varchar(30) not null,
default_join_policy varchar(30) default 'open' not null
constraint group_types_join_policy_ck
check (default_join_policy in
Index: openacs-4/packages/acs-subsite/tcl/group-type-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/group-type-procs.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/tcl/group-type-procs.tcl 3 Aug 2001 21:09:20 -0000 1.2
+++ openacs-4/packages/acs-subsite/tcl/group-type-procs.tcl 20 Aug 2001 21:52:31 -0000 1.3
@@ -174,6 +174,8 @@
return -code error $errmsg
}
+ # We need to add something to the group_types table, too! (Ben - OpenACS)
+ db_dml insert_group_type {}
# Finally, create the PL/SQL package.
Index: openacs-4/packages/acs-subsite/tcl/group-type-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/group-type-procs.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/tcl/group-type-procs.xql 6 May 2001 21:40:21 -0000 1.1
+++ openacs-4/packages/acs-subsite/tcl/group-type-procs.xql 20 Aug 2001 21:52:31 -0000 1.2
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<queryset>
-<fullquery name="new.select_group_id_column">
+<fullquery name="group_type::new.select_group_id_column">
<querytext>
select upper(id_column) from acs_object_types where object_type='group'
@@ -10,7 +10,7 @@
</fullquery>
-<fullquery name="new.supertype_table_column">
+<fullquery name="group_type::new.supertype_table_column">
<querytext>
select t.table_name as references_table,
@@ -21,5 +21,11 @@
</querytext>
</fullquery>
+
+<fullquery name="group_type::new.insert_group_type">
+ <querytext>
+ insert into group_types (group_type) values (:group_type)
+ </querytext>
+</fullquery>
</queryset>
Index: openacs-4/packages/acs-subsite/tcl/rel-types-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/rel-types-procs.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/tcl/rel-types-procs.tcl 20 Aug 2001 05:15:28 -0000 1.4
+++ openacs-4/packages/acs-subsite/tcl/rel-types-procs.tcl 20 Aug 2001 21:52:31 -0000 1.5
@@ -166,8 +166,6 @@
references $references_table ($references_column)
constraint $pk_constraint_name primary key
)"} errmsg] } {
- ns_log Notice "BEN PROBLEM : $errmsg"
-
# Roll back our work so for
for { set i [expr [llength $plsql_drop] - 1] } { $i >= 0 } { incr i -1 } {
set drop_pair [lindex $plsql_drop $i]
@@ -197,6 +195,18 @@
} errmsg]} {
}
}
+
+ ad_proc -public remove_permissible {
+ group_type
+ rel_type
+ } {
+ Add a permissible relationship for a given group type
+ } {
+ if {[catch {
+ db_dml delete_rel_type {}
+ } errmsg]} {
+ }
+ }
}
Index: openacs-4/packages/acs-subsite/tcl/rel-types-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/rel-types-procs.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/tcl/rel-types-procs.xql 19 Aug 2001 16:32:14 -0000 1.2
+++ openacs-4/packages/acs-subsite/tcl/rel-types-procs.xql 20 Aug 2001 21:52:31 -0000 1.3
@@ -26,5 +26,13 @@
(acs_object_id_seq.nextval, :group_type, :rel_type)
</querytext>
</fullquery>
+
+<fullquery name="rel_types::remove_permissible.delete_rel_type">
+<querytext>
+delete from group_type_rels
+where group_type= :group_type
+and rel_type= :rel_type
+</querytext>
+</fullquery>
</queryset>
Index: openacs-4/packages/acs-subsite/www/admin/group-types/delete-2-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/Attic/delete-2-oracle.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/admin/group-types/delete-2-oracle.xql 3 Aug 2001 21:09:20 -0000 1.2
+++ openacs-4/packages/acs-subsite/www/admin/group-types/delete-2-oracle.xql 20 Aug 2001 21:52:31 -0000 1.3
@@ -56,5 +56,12 @@
</querytext>
</partialquery>
-
+<partialquery name="delete_group_type">
+<querytext>
+begin
+delete from group_types where group_type=:group_type;
+end;
+</querytext>
+</partialquery>
+
</queryset>
Index: openacs-4/packages/acs-subsite/www/admin/group-types/delete-2-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/Attic/delete-2-postgresql.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/admin/group-types/delete-2-postgresql.xql 3 Aug 2001 21:09:20 -0000 1.2
+++ openacs-4/packages/acs-subsite/www/admin/group-types/delete-2-postgresql.xql 20 Aug 2001 21:52:31 -0000 1.3
@@ -63,4 +63,13 @@
</partialquery>
+<partialquery name="delete_group_type">
+<querytext>
+begin
+delete from group_types where group_type=:group_type;
+return 1;
+end;
+</querytext>
+</partialquery>
+
</queryset>
Index: openacs-4/packages/acs-subsite/www/admin/group-types/delete-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/delete-2.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/admin/group-types/delete-2.tcl 3 Aug 2001 21:09:20 -0000 1.2
+++ openacs-4/packages/acs-subsite/www/admin/group-types/delete-2.tcl 20 Aug 2001 21:52:31 -0000 1.3
@@ -58,6 +58,9 @@
# Remove the specified rel_types
lappend plsql [list "delete_rel_types" [db_map delete_rel_types]]
+# Remove the group_type
+lappend plsql [list "delete_group_type" [db_map delete_group_type]]
+
if { [db_string type_exists {
select case when exists (select 1 from acs_object_types t where t.object_type = :group_type)
then 1
Index: openacs-4/packages/acs-subsite/www/admin/group-types/delete-2.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/Attic/delete-2.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/group-types/delete-2.xql 15 May 2001 16:59:00 -0000 1.1
+++ openacs-4/packages/acs-subsite/www/admin/group-types/delete-2.xql 20 Aug 2001 21:52:31 -0000 1.2
@@ -25,5 +25,4 @@
</querytext>
</fullquery>
-
</queryset>
Index: openacs-4/packages/acs-tcl/tcl/site-nodes-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/site-nodes-procs.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-tcl/tcl/site-nodes-procs.tcl 19 Aug 2001 16:32:15 -0000 1.2
+++ openacs-4/packages/acs-tcl/tcl/site-nodes-procs.tcl 20 Aug 2001 21:52:31 -0000 1.3
@@ -310,7 +310,10 @@
return $package_id
} elseif { [string eq $return "node_id"] } {
return $node_id
- }
+ } elseif { [string eq $return "package_id,node_id"] } {
+ return [list $package_id $node_id]
+ }
+
error "Unknown return key: $return. Must be either package_id, node_id"
}