Index: openacs-4/packages/acs-subsite/www/admin/groups/elements-by-rel-type-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/Attic/elements-by-rel-type-postgresql.xql,v
diff -u -r1.1 -r1.1.30.1
--- openacs-4/packages/acs-subsite/www/admin/groups/elements-by-rel-type-postgresql.xql	15 May 2001 16:59:00 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/groups/elements-by-rel-type-postgresql.xql	13 Jun 2016 11:05:52 -0000	1.1.30.1
@@ -6,7 +6,43 @@
 <fullquery name="relations_query">      
       <querytext>
 
-    select g.rel_type, g.group_rel_id,
+    select
+       g.group_id, g.rel_type, g.rel_type_valid_p, gr.group_rel_id,
+       acs_object_type__pretty_name(g.rel_type) as rel_type_pretty_name,
+       s.segment_id, s.segment_name,
+       acs_rel_type__role_pretty_plural(rel_types.role_two) as role_pretty_plural,
+       acs_rel_type__role_pretty_name(rel_types.role_two) as role_pretty_name,
+       rels.num_rels    
+    from (
+       select v.group_id, v.rel_type, 
+              case when v.group_id = null then 0 else 1 end as rel_type_valid_p
+       from rc_valid_rel_types v where v.group_id = :group_id
+    ) g
+	     left outer join rel_segments s using (group_id, rel_type)
+     	     left outer join group_rels gr using (group_id, rel_type)
+	     left outer join
+	       (select rel_type, count(*) as num_rels
+	          from group_component_map
+		 where group_id = :group_id
+		   and group_id = container_id
+	      group by rel_type
+	      UNION ALL
+	        select rel_type, count(*) as num_rels
+		  from group_approved_member_map
+		 where group_id = :group_id
+		   and group_id = container_id
+	      group by rel_type) rels using (rel_type),
+	   acs_rel_types rel_types
+     where g.rel_type = rel_types.rel_type
+  order by lower(g.rel_type)
+      </querytext>
+</fullquery>
+
+
+<fullquery name="relations_query_OLD">      
+      <querytext>
+
+    select g.rel_type, g.group_rel_id, 
            acs_object_type__pretty_name(g.rel_type) as rel_type_pretty_name,
            s.segment_id, s.segment_name, 
            acs_rel_type__role_pretty_plural(rel_types.role_two) as role_pretty_plural,
@@ -30,11 +66,11 @@
 	      group by rel_type) rels using (rel_type),
 	   acs_rel_types rel_types
      where g.rel_type = rel_types.rel_type
-       and g.group_id = :group_id
   order by lower(g.rel_type)
 
       </querytext>
 </fullquery>
 
- 
+
+
 </queryset>
Index: openacs-4/packages/acs-subsite/www/admin/groups/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/one.adp,v
diff -u -r1.11 -r1.11.2.1
--- openacs-4/packages/acs-subsite/www/admin/groups/one.adp	14 Jul 2015 22:26:56 -0000	1.11
+++ openacs-4/packages/acs-subsite/www/admin/groups/one.adp	13 Jun 2016 11:05:52 -0000	1.11.2.1
@@ -2,6 +2,9 @@
 <property name="context">@context;literal@</property>
 <property name="doc(title)">@group_name;literal@</property>
 
+<h2>Manage Group: @group_name@</h2>
+Group Type: @group_type_pretty_name@
+
 <h3>Attributes</h3>
 
 <ul>
Index: openacs-4/packages/acs-subsite/www/admin/groups/one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/one.tcl,v
diff -u -r1.8.2.1 -r1.8.2.2
--- openacs-4/packages/acs-subsite/www/admin/groups/one.tcl	10 Sep 2015 08:21:42 -0000	1.8.2.1
+++ openacs-4/packages/acs-subsite/www/admin/groups/one.tcl	13 Jun 2016 11:05:52 -0000	1.8.2.2
@@ -44,7 +44,8 @@
 
 db_1row group_info {
     select g.group_name, g.join_policy,
-           o.object_type as group_type
+           o.object_type as group_type,
+           t.pretty_name
       from groups g, acs_objects o, acs_object_types t
      where g.group_id = o.object_id
        and o.object_type = t.object_type
Fisheye: Tag 1.1.30.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/admin/groups/one.xql'.
Fisheye: No comparison available.  Pass `N' to diff?