Index: openacs-4/packages/acs-subsite/www/admin/relations/one.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/relations/one.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/acs-subsite/www/admin/relations/one.tcl 27 Oct 2014 16:39:55 -0000 1.4 +++ openacs-4/packages/acs-subsite/www/admin/relations/one.tcl 7 Aug 2017 23:47:58 -0000 1.5 @@ -45,18 +45,7 @@ set subsite_group_id [application_group::group_id_from_package_id] -if { ![db_0or1row select_rel_info { - select r.rel_type, acs_object_type.pretty_name(t.rel_type) as rel_type_pretty_name, - acs_rel_type.role_pretty_name(t.role_one) as role_one_pretty_name, - acs_rel_type.role_pretty_name(t.role_two) as role_two_pretty_name, - t.object_type_two as object_type_two, - acs_object.name(r.object_id_one) as object_id_one_name, - r.object_id_one, - acs_object.name(r.object_id_two) as object_id_two_name, - r.object_id_two - from acs_rels r, acs_rel_types t - where r.rel_id = :rel_id - and r.rel_type = t.rel_type} -column_array rel] +if { ![db_0or1row select_rel_info {} -column_array rel] } { ad_return_error "Error" "Relation #rel_id does not exist" ad_script_abort @@ -88,7 +77,7 @@ # Data used to build the "toggle member state" widget. set return_url [ad_conn url]?[ad_conn query] -set QQreturn_url [ad_quotehtml $return_url] +set QQreturn_url [ns_quotehtml $return_url] set possible_member_states [group::possible_member_states] set object_two_read_p [permission::permission_p -object_id $rel(object_id_two) -privilege "read"] @@ -103,3 +92,9 @@ } ad_return_template + +# Local variables: +# mode: tcl +# tcl-indent-level: 4 +# indent-tabs-mode: nil +# End: