Index: openacs-4/packages/acs-subsite/www/admin/group-types/delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/delete.tcl,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/acs-subsite/www/admin/group-types/delete.tcl 27 Jun 2015 16:03:12 -0000 1.5 +++ openacs-4/packages/acs-subsite/www/admin/group-types/delete.tcl 7 Aug 2017 23:47:58 -0000 1.6 @@ -10,7 +10,7 @@ } { group_type:notnull - { return_url "" } + { return_url:localurl "" } } -properties { subtypes:multirow context:onevalue @@ -42,13 +42,7 @@ return } -set subtypes_exist_p [db_string number_subtypes { - select case when exists (select 1 - from acs_object_types t - where t.supertype = :group_type) - then 1 else 0 end - from dual -}] +set subtypes_exist_p [db_string number_subtypes {}] if { $subtypes_exist_p } { set return_url "[ad_conn url]?[ad_conn query]" @@ -68,14 +62,7 @@ } # Now let's check if any relationship types depend on this group type -set rel_types_depend_p [db_string rel_type_exists_p { - select case when exists (select 1 - from acs_rel_types t - where t.object_type_one = :group_type - or t.object_type_two = :group_type) - then 1 else 0 end - from dual -}] +set rel_types_depend_p [db_string rel_type_exists_p {}] if { $rel_types_depend_p } { set return_url "[ad_conn url]?[ad_conn query]" @@ -114,3 +101,9 @@ }]] ad_return_template + +# Local variables: +# mode: tcl +# tcl-indent-level: 4 +# indent-tabs-mode: nil +# End: