Browse Source

merged

Natenom/support-murmur-13-1446181288462
Michael Ziegler 16 years ago
parent
commit
f96df803c3
  1. 5
      pyweb/mumble/models.py
  2. 2
      template/mumble/mumble.htm

5
pyweb/mumble/models.py

@ -272,7 +272,12 @@ class MumbleUser( models.Model ):
murmur = self.server.getDbusObject(); murmur = self.server.getDbusObject();
murmur.unregisterPlayer( dbus.Int32( self.mumbleid ) ); murmur.unregisterPlayer( dbus.Int32( self.mumbleid ) );
def __setattr__( self, name, value ):
if name == 'server':
if self.id is not None and self.server != value:
raise AttributeError( "This field must not be updated once the Record has been saved." );
models.Model.__setattr__( self, name, value );
from django.db.models import signals from django.db.models import signals

2
template/mumble/mumble.htm

@ -44,6 +44,8 @@
You can upload an image that you would like to use as your user texture here.<br /> You can upload an image that you would like to use as your user texture here.<br />
Your current texture is:<br /> Your current texture is:<br />
<img src="/mumble/{{DBaseObject.id}}/texture.jpg" alt="user texture" /><br /> <img src="/mumble/{{DBaseObject.id}}/texture.jpg" alt="user texture" /><br />
Hint: The texture image <b>needs</b> to be 600x60 in size. If you upload an image with
a different size, it will be resized accordingly.<br />
</p> </p>
<form action="" method="post" enctype="multipart/form-data"> <form action="" method="post" enctype="multipart/form-data">
<table> <table>

Loading…
Cancel
Save