[Pkg-voip-commits] r8069 - in /mumble-django/trunk/debian: changelog patches/03-channel-selector-bug.diff patches/series

[svedrin-guest at alioth.debian.org]

Author: svedrin-guest
Date: Tue Feb 16 20:15:40 2010
New Revision: 8069

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8069
Log:
Add patch to fix the upstream bug in the default channel selector that makes
the "add server instance" form unusable. See here for details:
http://bitbucket.org/Svedrin/mumble-django/changeset/5e815cf03009/

Added:
    mumble-django/trunk/debian/patches/03-channel-selector-bug.diff
Modified:
    mumble-django/trunk/debian/changelog
    mumble-django/trunk/debian/patches/series

Modified: mumble-django/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/mumble-django/trunk/debian/changelog?rev=8069&op=diff
==============================================================================
--- mumble-django/trunk/debian/changelog (original)
+++ mumble-django/trunk/debian/changelog Tue Feb 16 20:15:40 2010
@@ -1,3 +1,11 @@
+mumble-django (1.5-2) unstable; urgency=low
+
+  * Add patch to fix the upstream bug in the default channel selector that makes
+    the "add server instance" form unusable. See here for details:
+    http://bitbucket.org/Svedrin/mumble-django/changeset/5e815cf03009/
+
+ -- Michael Ziegler <diese-addy at funzt-halt.net>  Tue, 16 Feb 2010 21:15:00 +0100
+
 mumble-django (1.5-1) unstable; urgency=low
 
   * New upstream release.

Added: mumble-django/trunk/debian/patches/03-channel-selector-bug.diff
URL: http://svn.debian.org/wsvn/pkg-voip/mumble-django/trunk/debian/patches/03-channel-selector-bug.diff?rev=8069&op=file
==============================================================================
--- mumble-django/trunk/debian/patches/03-channel-selector-bug.diff (added)
+++ mumble-django/trunk/debian/patches/03-channel-selector-bug.diff Tue Feb 16 20:15:40 2010
@@ -1,0 +1,26 @@
+# Fix the upstream bug that rendered the "Add server instance" form
+# unusable. See here for details:
+# http://bitbucket.org/Svedrin/mumble-django/changeset/5e815cf03009/ 
+
+Index: mumble-django-1.5/pyweb/mumble/forms.py
+===================================================================
+--- mumble-django-1.5.orig/pyweb/mumble/forms.py	2010-02-16 21:12:09.000000000 +0100
++++ mumble-django-1.5/pyweb/mumble/forms.py	2010-02-16 21:12:56.000000000 +0100
+@@ -29,11 +29,12 @@
+ 	""" Populate the `default channel' field's choices """
+ 	choices = [ ('', '----------') ]
+ 	
+-	def add_item( item, level ):
+-		if item.is_server or item.is_channel:
+-			choices.append( ( str(item.chanid), ( "-"*level + " " + item.name ) ) )
+-	
+-	form.instance.rootchan.visit(add_item)
++	if form.instance and form.instance.srvid is not None and form.instance.booted:
++		def add_item( item, level ):
++			if item.is_server or item.is_channel:
++				choices.append( ( str(item.chanid), ( "-"*level + " " + item.name ) ) )
++		
++		form.instance.rootchan.visit(add_item)
+ 	
+ 	form.fields['defchan'].choices = choices
+ 

Modified: mumble-django/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/mumble-django/trunk/debian/patches/series?rev=8069&op=diff
==============================================================================
--- mumble-django/trunk/debian/patches/series (original)
+++ mumble-django/trunk/debian/patches/series Tue Feb 16 20:15:40 2010
@@ -1,2 +1,3 @@
+03-channel-selector-bug.diff
 01-settings.diff
 02-munin.diff