Index: openacs-4/packages/xotcl-core/www/show-object.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/www/show-object.tcl,v diff -u -N -r1.15.6.5 -r1.15.6.6 --- openacs-4/packages/xotcl-core/www/show-object.tcl 24 Sep 2013 20:17:46 -0000 1.15.6.5 +++ openacs-4/packages/xotcl-core/www/show-object.tcl 14 Feb 2014 18:23:18 -0000 1.15.6.6 @@ -22,18 +22,18 @@ # scope must be an object, otherwise something is wrong. # if {$scope ne "" && ![xo::getObjectProperty $scope isobject]} { - set isobject 0 + set isobject 0 } else { - set isobject [::xotcl::api isobject $scope $object] + set isobject [::xotcl::api isobject $scope $object] } if {$scope ne ""} { - auth::require_login + auth::require_login } if {!$isobject} { ad_return_complaint 1 "Unable to access object $object. - Might this be a temporary object?" + Might this be a temporary object?" ad_script_abort } @@ -67,17 +67,17 @@ { 0 "Hide Variables" } } } - }] +}] proc api_documentation {scope object kind method} { upvar show_methods show_methods set proc_index [::xotcl::api proc_index $scope $object $kind $method] if {[nsv_exists api_proc_doc $proc_index]} { set documentation [api_proc_documentation \ - -first_line_tag "
[ns_quotehtml [lindex $doc_elements(cvs-id) 0]]
\n"
+ [ns_quotehtml [lindex $doc_elements(cvs-id) 0]]
\n"
}
append output "\n"
@@ -261,9 +261,9 @@
set output "" \ - [api_tcl_to_html [::xotcl::api proc_index $scope $object $proc $m]] \ -+ "
" \ + [api_tcl_to_html [::xotcl::api proc_index $scope $object $proc $m]] \ +} return $output } @@ -289,12 +289,12 @@ set out [api_documentation $scope $object instproc $m] if {$out ne ""} { append output "
" \ - [api_tcl_to_html [::xotcl::api proc_index $scope $object instproc $m]] \ -- } + if { $show_source } { + append output \ + "
" \ + [api_tcl_to_html [::xotcl::api proc_index $scope $object instproc $m]] \ ++ } } } } @@ -312,7 +312,7 @@ } if {$vars ne ""} { append output "
\n \ - $instances \ -\n +
\n \ + $instances \ +\n } } DO $s destroy + +# +# Local variables: +# mode: tcl +# tcl-indent-level: 2 +# indent-tabs-mode: nil +# End: