fixed my last two fixes. it was just too late at night yesterday.

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 or srv.channels[id].parent.show ):
+		if id != 0 and srv.channels[id].show:
 			channelTable.append( srv.channels[id] );
 	for id in srv.players:
 		channelTable.append( srv.players[id] );

template/mumble/channel.htm

@@ -9,11 +9,11 @@
   <a href="{{ Channel|chanurl:MumbleAccount }}" class="mumble" id="link_{{ Channel.id }}" title="{{ Channel.name }}">
     {{ Channel.name|trunc:30 }}
   </a>
-  {% if Channel.show %}
-    {% for sub in Channel.subchans %}
+  {% for sub in Channel.subchans %}
+    {% if sub.show %}
       {{ sub|chanview:MumbleAccount }}
-    {% endfor %}
-    {% for player in Channel.players %}{{ player|chanview }}{% endfor %}
-  {% endif %}
+    {% endif %}
+  {% endfor %}
+  {% for player in Channel.players %}{{ player|chanview }}{% endfor %}
 </div>
 

template/mumble/server.htm

@@ -4,6 +4,8 @@
   <a class="mumble" id="link_server" href="{{ Server|chanurl:MumbleAccount }}">{{ Server.name|trunc:30 }}</a>
 </div>
 {% for sub in Server.rootchan.subchans %}
-  {{ sub|chanview:MumbleAccount }}
+  {% if sub.show %}
+    {{ sub|chanview:MumbleAccount }}
+  {% endif %}
 {% endfor %}
 {% for player in Server.rootchan.players %}{{ player|chanview }}{% endfor %}