added rudimentary "admin" view to allow server admins to configure their servers without being able to alter "hoster only" config options

pyweb/mumble/forms.py

@@ -0,0 +1,9 @@
+from django.forms	import ModelForm
+from models			import *
+
+class MumbleForm( ModelForm ):
+	class Meta:
+		model   = Mumble;
+		exclude = ( 'dbus', 'booted', 'addr', 'port', 'users', 'bwidth', );
+	
+

pyweb/mumble/models.py

@@ -131,6 +131,14 @@ class Mumble( models.Model ):
 		# Now allow django to save the record set
 		return models.Model.save( self );
 	
+	def isUserAdmin( self, user ):
+		if user.is_authenticated():
+			try:
+				return self.mumbleuser_set.get( owner=user ).getAdmin();
+			except MumbleUser.DoesNotExist:
+				return False;
+		return False;
+	
 	def deleteServer( self ):
 		srvid = dbus.Int32( self.srvid );
 		murmur = self.getDbusMeta();

pyweb/mumble/urls.py

@@ -4,6 +4,7 @@ urlpatterns = patterns(
 	'',
 	( r'savereg',			'mumble.views.savereg' ),
 	( r'reg/(?P<server>\d+)',	'mumble.views.register' ),
+	( r'admin/(?P<serverid>\d+)',	'mumble.views.admin' ),
 	( r'(?P<server>\d+)',		'mumble.views.show' ),
 	( r'$',				'mumble.views.mumbles' ),
 )

pyweb/mumble/views.py

@@ -37,6 +37,7 @@ from django.core.urlresolvers		import reverse
 from django.contrib.auth.decorators	import login_required
 
 from models	import Mumble, MumbleUser
+from forms import *
 from mmobjects	import mmServer, mmChannel
 
 class Storage( object ):
@@ -55,10 +56,10 @@ def mumbles( request ):
 def show( request, server ):
 	"Displays the channel list for the given Server ID."
 	srv, o = createChannelList( server );
-	
+		
 	return render_to_response(
 		'mumble/mumble.htm',
-		{ 'DBaseObject': srv, 'ServerObject': o, 'ChannelTable': Storage.s },
+		{ 'DBaseObject': srv, 'ServerObject': o, 'ChannelTable': Storage.s, "CurrentUserIsAdmin": srv.isUserAdmin( request.user ) },
 		context_instance = RequestContext(request)
 		);
 
@@ -152,6 +153,24 @@ def savereg( request ):
 	return HttpResponseRedirect( "/mumble/%d" % srv.id );
 
 
+	
+@login_required
+def admin( request, serverid ):
+	murmur = get_object_or_404( Mumble, id=serverid );
+	
+	if request.method == 'POST':
+		form = MumbleForm( request.POST, instance=murmur );
+		if form.is_valid():
+			form.save();
+			return HttpResponseRedirect( '/mumble/%d' % int(serverid) );
+	else:
+		form = MumbleForm( instance=murmur );
+	
+	return render_to_response(
+		'mumble/admin.htm',
+		{ "Mumble": murmur, "Adminform": form, "CurrentUserIsAdmin": murmur.isUserAdmin( request.user ) },
+		context_instance = RequestContext(request)
+		);
 
 
 

template/mumble/admin.htm

@@ -0,0 +1,19 @@
+{% extends "base.htm" %}
+{% block content %}
+{% if user.is_authenticated %}
+  {% if CurrentUserIsAdmin %}
+    <h2>Configure Mumble server</h2>
+    <p>Here you can configure your Murmur server in detail.</p>
+    <form action="/mumble/admin/{{Mumble.id}}" method="post">
+      <table>
+        {{ Adminform }}
+      </table>
+      <input type="submit" />
+    </form>
+  {% else %}
+	<p>Only admins of this server can use this feature.</p>
+  {% endif %}
+{% else %}
+  <p>Only registered users can use this feature.</p>
+{% endif %}
+{% endblock %}

template/mumble/content.htm

@@ -55,5 +55,8 @@
     </tr>
   {% endfor %}
   </table>
-  <p><a href="/mumble/reg/{{DBaseObject.id}}" class="dingen">Mumble-Account verwalten</a></p>
+  <p><a href="/mumble/reg/{{DBaseObject.id}}" class="dingen">Manage Account</a></p>
+  {% if CurrentUserIsAdmin %}
+    <p><a href="/mumble/admin/{{DBaseObject.id}}" class="dingen">Manage Server settings</a></p>
+  {% endif %}
 </div>