Browse Source

last fix didn't help...

Natenom/support-murmur-13-1446181288462
Michael Ziegler 15 years ago
parent
commit
d34aa40dbe
  1. 2
      pyweb/mumble/mmobjects.py
  2. 2
      pyweb/mumble/views.py

2
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 '<Channel "%s" (%d)>' % ( self.name, self.chanid );

2
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] );

Loading…
Cancel
Save