Index: openacs-4/packages/acs-subsite/www/admin/groups/elements-display-list.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/elements-display-list.tcl,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/acs-subsite/www/admin/groups/elements-display-list.tcl 27 Jun 2015 16:03:12 -0000 1.5 +++ openacs-4/packages/acs-subsite/www/admin/groups/elements-display-list.tcl 7 Aug 2017 23:47:58 -0000 1.6 @@ -33,42 +33,20 @@ # Pull out all the relations of the specified type -db_1row rel_type_info { - select object_type as ancestor_rel_type - from acs_object_types - where supertype = 'relationship' - and object_type in ( - select object_type from acs_object_types - start with object_type = :rel_type - connect by object_type = prior supertype - ) -} +db_1row rel_type_info {} set extra_tables "" set extra_where_clauses "" if {$ancestor_rel_type eq "membership_rel"} { if {$member_state ne ""} { set extra_tables "membership_rels mr," - set extra_where_clauses " - and mr.rel_id = rels.rel_id - and mr.member_state = :member_state" + set extra_where_clauses { + and mr.rel_id = rels.rel_id + and mr.member_state = :member_state} } } -db_multirow rels relations_query " -select r.rel_id, - party_names.party_name as element_name -from (select /*+ ORDERED */ DISTINCT rels.rel_id, object_id_two - from $extra_tables acs_rels rels, all_object_party_privilege_map perm - where perm.object_id = rels.rel_id - and perm.party_id = :user_id - and perm.privilege = 'read' - and rels.rel_type = :rel_type - and rels.object_id_one = :group_id $extra_where_clauses) r, - party_names -where r.object_id_two = party_names.party_id -order by lower(element_name) -" +db_multirow rels relations_query {} # Build the member state dimensional slider @@ -84,3 +62,9 @@ $state $state $base_url&member_state=[ad_urlencode $state] } + +# Local variables: +# mode: tcl +# tcl-indent-level: 4 +# indent-tabs-mode: nil +# End: