Index: openacs-4/packages/acs-subsite/www/admin/group-types/one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/one.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-subsite/www/admin/group-types/one.tcl	27 Jun 2015 16:47:27 -0000	1.7
+++ openacs-4/packages/acs-subsite/www/admin/group-types/one.tcl	7 Aug 2017 23:47:58 -0000	1.8
@@ -29,54 +29,23 @@
 
 set package_id [ad_conn package_id]
 
-if { ![db_0or1row select_pretty_name {
-    select t.pretty_name as group_type_pretty_name, t.dynamic_p,
-           nvl(gt.default_join_policy, 'open') as default_join_policy
-      from acs_object_types t, group_types gt
-     where t.object_type = :group_type
-       and t.object_type = gt.group_type(+)
-}] } {
+if { ![db_0or1row select_pretty_name {}] } {
     ad_return_error "Group type doesn't exist" "Group type \"$group_type\" doesn't exist"
     return
 }
 
 set doc(title) [_ acs-subsite.Details_for__group_type_pretty_name]
-
 set context [list [list "[ad_conn package_url]admin/group-types/" [_ acs-subsite.Group_Types]] $group_type_pretty_name]
 
+acs_object_type::get -object_type $group_type -array type_info
+
 # Pull out the first 25 groups of this type. If there are more, we'll
 # offer a link to display them all. Alphabetize the first 25 groups
 
-db_multirow groups groups_select {
-    select my_view.group_name, my_view.group_id, rownum as num 
-    from (select /*+ ORDERED */ DISTINCT  g.group_name, g.group_id
-           from acs_objects o, groups g,
-                application_group_element_map app_group, 
-                all_object_party_privilege_map perm
-          where perm.object_id = g.group_id
-            and perm.party_id = :user_id
-            and perm.privilege = 'read'
-            and g.group_id = o.object_id
-            and o.object_type = :group_type
-            and app_group.package_id = :package_id
-            and app_group.element_id = g.group_id
-          order by lower(g.group_name)) my_view 
-    where rownum <= 26
-}
+db_multirow groups groups_select {}
 
 # Select out all the attributes for groups of this type
-db_multirow -extend {one_attribute_url} attributes attributes_select {
-    select a.attribute_id, a.pretty_name, 
-           a.ancestor_type, t.pretty_name as ancestor_pretty_name
-      from acs_object_type_attributes a,
-           (select t.object_type, t.pretty_name, level as type_level
-              from acs_object_types t
-             start with t.object_type='group'
-           connect by prior t.object_type = t.supertype) t 
-     where a.object_type = :group_type
-       and t.object_type = a.ancestor_type
-    order by type_level 
-} {
+db_multirow -extend {one_attribute_url} attributes attributes_select {} {
     set one_attribute_url [export_vars -base "../attributes/one" {attribute_id return_url}]
 }
 
@@ -94,8 +63,16 @@
 # See if we need to offer a link to add a rel type
 set more_relation_types_p [rel_types::additional_rel_types_p -group_type $group_type]
 
-set add_group_url [export_vars -base "../parties/new" {{party_type $group_type} {add_with_rel_type composition_rel} return_url}]
+set add_group_url [export_vars -base "../groups/new" {
+    {group_type $group_type} {add_with_rel_type composition_rel} return_url
+}]
 
 set add_attribute_url [export_vars -base "../attributes/add" {{object_type $group_type} return_url}]
 
 
+
+# Local variables:
+#    mode: tcl
+#    tcl-indent-level: 4
+#    indent-tabs-mode: nil
+# End: