Browse Source

fix resync button and its translation string

Natenom/support-murmur-13-1446181288462
Michael Ziegler 14 years ago
parent
commit
56fdc1c111
  1. BIN
      pyweb/mumble/locale/de/LC_MESSAGES/djangojs.mo
  2. 4
      pyweb/mumble/locale/de/LC_MESSAGES/djangojs.po
  3. 12
      pyweb/mumble/media/js/usereditor.js
  4. 4
      pyweb/mumble/views.py

BIN
pyweb/mumble/locale/de/LC_MESSAGES/djangojs.mo

4
pyweb/mumble/locale/de/LC_MESSAGES/djangojs.po

@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-08-22 15:10+0200\n" "POT-Creation-Date: 2010-08-22 15:10+0200\n"
"PO-Revision-Date: 2010-08-22 15:13\n"
"PO-Revision-Date: 2010-10-10 16:52\n"
"Last-Translator: <diese-addy@funzt-halt.net>\n" "Last-Translator: <diese-addy@funzt-halt.net>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@ -281,7 +281,7 @@ msgstr "Konnte nicht speichern."
#: media/js/usereditor.js:135 #: media/js/usereditor.js:135
msgid "Resync with Murmur" msgid "Resync with Murmur"
msgstr "Aktualisieren"
msgstr "Aktualisieren (von Murmur)"
#~ msgid "User texture" #~ msgid "User texture"
#~ msgstr "Benutzertextur" #~ msgstr "Benutzertextur"

12
pyweb/mumble/media/js/usereditor.js

@ -15,9 +15,10 @@ Ext.ux.UserEditorPanel = function( config ){
]); ]);
userAdminStore = new Ext.data.DirectStore({ userAdminStore = new Ext.data.DirectStore({
baseParams: { server: this.server },
baseParams: { server: this.server, resync: false },
directFn: MumbleUserAdmin.users, directFn: MumbleUserAdmin.users,
fields: userRecord, fields: userRecord,
paramOrder: ['server', 'resync'],
autoLoad: true, autoLoad: true,
remoteSort: false remoteSort: false
}); });
@ -130,11 +131,18 @@ Ext.ux.UserEditorPanel = function( config ){
} }
}); });
} }
}, {
text: gettext("Refresh"),
handler: function(){
userAdminStore.reload({
params: { 'resync': false }
});
}
}, { }, {
text: gettext("Resync with Murmur"), text: gettext("Resync with Murmur"),
handler: function(){ handler: function(){
userAdminStore.reload({ userAdminStore.reload({
params: { 'resync': 'true' }
params: { 'resync': true }
}); });
} }
}], }],

4
pyweb/mumble/views.py

@ -327,7 +327,7 @@ def sendMessageChannel( request, server, channelid, tree, message ):
srv.sendMessageChannel(channelid, tree, message) srv.sendMessageChannel(channelid, tree, message)
@EXT_DIRECT_PROVIDER.register_method( "MumbleUserAdmin" ) @EXT_DIRECT_PROVIDER.register_method( "MumbleUserAdmin" )
def users( request, server ):
def users( request, server, resync=False ):
""" Create a list of MumbleUsers for a given server serialized as a JSON object. """ Create a list of MumbleUsers for a given server serialized as a JSON object.
If the request has a "data" field, evaluate that and update the user records. If the request has a "data" field, evaluate that and update the user records.
@ -335,7 +335,7 @@ def users( request, server ):
srv = get_object_or_404( Mumble, id=int(server) ) srv = get_object_or_404( Mumble, id=int(server) )
if "resync" in request.POST and request.POST['resync'] == "true":
if resync:
srv.readUsersFromMurmur() srv.readUsersFromMurmur()
if not srv.isUserAdmin( request.user ): if not srv.isUserAdmin( request.user ):

Loading…
Cancel
Save