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 -r1.22.2.10 -r1.22.2.11
--- openacs-4/packages/xotcl-core/www/show-object.tcl 6 Jan 2016 11:57:21 -0000 1.22.2.10
+++ openacs-4/packages/xotcl-core/www/show-object.tcl 6 Jan 2016 22:19:16 -0000 1.22.2.11
@@ -88,7 +88,7 @@
$proc_index]
set result $documentation
} else {
- if {$show_methods == 2} {
+ if {$show_methods > 1} {
set result "
$method ($proc_type)
\n"
append result [::xo::api debug_widget [list {*}$scope $object $kind $method]]
} else {
@@ -281,8 +281,7 @@
append obj_create_source \
[info_option $scope $object class] \
[info_option $scope $object superclass] \
- [info_option $scope $object instmixin] \
- [info_option $scope $object subclass 1]
+ [info_option $scope $object instmixin]
}
append obj_create_source \
@@ -311,27 +310,27 @@
#
# per-object methods
#
- set methods0 [lsort [DO ::xo::getObjectProperty $object command]]
- #
- # filter (sub)objects, which are callable via the method interface
- #
- set methods {}
- foreach m $methods0 {
- if {[DO ::xo::getObjectProperty $object methodtype $m] eq "object"} {
- continue
- }
- lappend methods $m
- }
+ set methods [lsort [DO ::xo::getObjectProperty $object command]]
if {[llength $methods] > 0} {
- append output "Methods (to be applied on the object)
\n" \n
+ set method_output ""
foreach m $methods {
set type [DO ::xo::getObjectProperty $object methodtype $m]
+ if {$type eq "object"} {
+ #
+ # filter (sub)objects, which are callable via the method interface
+ #
+ continue
+ }
set out [local_api_documentation -proc_type $type $show_methods $scope $object proc $m]
if {$out ne ""} {
- append output [api_src_doc $out $show_source $scope $object proc $m]
+ append method_output [api_src_doc $out $show_source $scope $object proc $m]
}
}
- append output
\n
+ if {$method_output ne ""} {
+ append output \
+ "Methods (to be applied on the object) //$methods
\n" \
+ \n
+ }
}
if {$isclass} {
@@ -340,21 +339,25 @@
#
set methods [lsort [DO ::xo::getObjectProperty $object instcommand]]
if {[llength $methods] > 0} {
- append output "Methods (to be applied on instances)
\n" \n
+ if {$method_output ne ""} {
+ append output \
+ "Methods (to be applied on instances)
\n" \
+ \n
+ }
}
}
}