Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/admin/groups/rel-type-remove-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/admin/groups/rel-type-remove-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/acs-subsite/www/admin/groups/rel-type-remove.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/rel-type-remove.tcl,v diff -u -r1.7 -r1.8 --- openacs-4/packages/acs-subsite/www/admin/groups/rel-type-remove.tcl 21 Jan 2018 00:35:29 -0000 1.7 +++ openacs-4/packages/acs-subsite/www/admin/groups/rel-type-remove.tcl 20 Jun 2018 08:35:45 -0000 1.8 @@ -19,7 +19,16 @@ export_vars:onevalue } -if { ![db_0or1row select_info {}] } { +if { ![db_0or1row select_info { + select g.rel_type, + g.group_id, + (select group_name from groups + where group_id = g.group_id) as group_name, + t.pretty_name as rel_pretty_name + from acs_object_types t, group_rels g + where g.group_rel_id = :group_rel_id + and t.object_type = g.rel_type +}] } { ad_return_error "Relation already removed." "Please back up and reload" ad_script_abort } @@ -32,8 +41,6 @@ [list [export_vars -base one {group_id}] "One group"] \ "Remove relation type"] -ad_return_template - # Local variables: # mode: tcl # tcl-indent-level: 4 Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/admin/groups/delete-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/admin/groups/delete-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/acs-subsite/www/admin/groups/delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/delete.tcl,v diff -u -r1.8 -r1.9 --- openacs-4/packages/acs-subsite/www/admin/groups/delete.tcl 7 Jun 2018 17:30:17 -0000 1.8 +++ openacs-4/packages/acs-subsite/www/admin/groups/delete.tcl 20 Jun 2018 08:44:15 -0000 1.9 @@ -24,13 +24,19 @@ } set context [list [list "" "Groups"] [list [export_vars -base one {group_id}] "One Group"] "Nuke group"] -set group_name [db_string object_name {}] +set group_name [group::get_element -group_id $group_id -element group_name] set export_form_vars [export_vars -form {group_id}] -db_1row select_counts {} -column_array number +db_1row select_counts { + select (select count(*) from group_element_map where group_id = :group_id) as elements, + (select count(*) from rel_segments where group_id = :group_id) as segments, + (select count(*) + from rel_constraints cons, rel_segments segs + where segs.segment_id in (cons.rel_segment,cons.required_rel_segment) + and segs.group_id = :group_id) as constraints + from dual +} -column_array number -ad_return_template - # Local variables: # mode: tcl # tcl-indent-level: 4