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.7 -r1.8
--- openacs-4/packages/acs-subsite/www/admin/group-types/delete-2.tcl	27 Jun 2015 16:03:12 -0000	1.7
+++ openacs-4/packages/acs-subsite/www/admin/group-types/delete-2.tcl	7 Aug 2017 23:47:58 -0000	1.8
@@ -10,7 +10,7 @@
 
 } {
     group_type
-    { return_url "" }
+    { return_url:localurl "" }
     { operation "" }
 } -properties {
     context:onevalue
@@ -42,14 +42,7 @@
     set package_name $group_type
 }
     
-if { [db_string package_exists {
-    select case when exists (select 1 
-                               from user_objects o
-                              where o.object_type='PACKAGE' 
-                                and o.object_name = upper(:package_name))
-           then 1 else 0 end
-      from dual
-}] } {
+if { [db_string package_exists {}] } {
     lappend plsql [list "package_drop" [db_map package_drop]]
 } else {
     set package_name ""
@@ -61,13 +54,7 @@
 # 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
-                else 0
-           end
-      from dual
-}] } {
+if { [db_string type_exists {}] } {
     lappend plsql [list "drop_type" [db_map drop_type]]
 }
 
@@ -91,14 +78,7 @@
     # First delete the groups
     if { $package_name ne "" } {
 
-	foreach group_id [db_list select_group_ids {
-	    select o.object_id
-	    from acs_objects o, acs_object_party_privilege_map perm
-	    where perm.object_id = o.object_id
-              and perm.party_id = :user_id
-              and perm.privilege = 'delete'
-	      and o.object_type = :group_type
-	}] {
+	foreach group_id [db_list select_group_ids {}] {
 	    group::delete $group_id
 	}
     }
@@ -115,3 +95,9 @@
 package_object_view_reset $group_type
 
 ad_returnredirect $return_url 
+
+# Local variables:
+#    mode: tcl
+#    tcl-indent-level: 4
+#    indent-tabs-mode: nil
+# End: