From d34aa40dbe8f8c9ca2091a3a8ee76d5cc889a8f0 Mon Sep 17 00:00:00 2001 From: Michael Ziegler Date: Thu, 18 Jun 2009 01:43:10 +0200 Subject: [PATCH] last fix didn't help... --- pyweb/mumble/mmobjects.py | 2 +- pyweb/mumble/views.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pyweb/mumble/mmobjects.py b/pyweb/mumble/mmobjects.py index adbfc44..37cb9ed 100755 --- a/pyweb/mumble/mmobjects.py +++ b/pyweb/mumble/mmobjects.py @@ -63,7 +63,7 @@ class mmChannel( object ): id = property( lambda self: "channel_%d"%self.chanid, None ); - show = property( lambda self: self.parent is None or self.playerCount > 0, None ); + show = property( lambda self: self.parent is None or self.parent.chanid == 0 or self.playerCount > 0, None ); def __str__( self ): return '' % ( self.name, self.chanid ); diff --git a/pyweb/mumble/views.py b/pyweb/mumble/views.py index 59bff6a..84fc463 100755 --- a/pyweb/mumble/views.py +++ b/pyweb/mumble/views.py @@ -112,7 +112,7 @@ def show( request, server ): # ChannelTable is a somewhat misleading name, as it actually contains channels and players. channelTable = []; for id in srv.channels: - if id != 0 and srv.channels[id].show: + if id != 0 and ( srv.channels[id].show or srv.channels[id].parent.show ): channelTable.append( srv.channels[id] ); for id in srv.players: channelTable.append( srv.players[id] );