diff --git a/pyweb/mumble/locale/de/LC_MESSAGES/djangojs.mo b/pyweb/mumble/locale/de/LC_MESSAGES/djangojs.mo index 3845913..d02f2e0 100644 Binary files a/pyweb/mumble/locale/de/LC_MESSAGES/djangojs.mo and b/pyweb/mumble/locale/de/LC_MESSAGES/djangojs.mo differ diff --git a/pyweb/mumble/locale/de/LC_MESSAGES/djangojs.po b/pyweb/mumble/locale/de/LC_MESSAGES/djangojs.po index 0c0c067..7df539e 100644 --- a/pyweb/mumble/locale/de/LC_MESSAGES/djangojs.po +++ b/pyweb/mumble/locale/de/LC_MESSAGES/djangojs.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \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: \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -281,7 +281,7 @@ msgstr "Konnte nicht speichern." #: media/js/usereditor.js:135 msgid "Resync with Murmur" -msgstr "Aktualisieren" +msgstr "Aktualisieren (von Murmur)" #~ msgid "User texture" #~ msgstr "Benutzertextur" diff --git a/pyweb/mumble/media/js/usereditor.js b/pyweb/mumble/media/js/usereditor.js index 3bdaf85..db3ee37 100644 --- a/pyweb/mumble/media/js/usereditor.js +++ b/pyweb/mumble/media/js/usereditor.js @@ -15,9 +15,10 @@ Ext.ux.UserEditorPanel = function( config ){ ]); userAdminStore = new Ext.data.DirectStore({ - baseParams: { server: this.server }, + baseParams: { server: this.server, resync: false }, directFn: MumbleUserAdmin.users, fields: userRecord, + paramOrder: ['server', 'resync'], autoLoad: true, 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"), handler: function(){ userAdminStore.reload({ - params: { 'resync': 'true' } + params: { 'resync': true } }); } }], diff --git a/pyweb/mumble/views.py b/pyweb/mumble/views.py index ac1379d..434e4f9 100644 --- a/pyweb/mumble/views.py +++ b/pyweb/mumble/views.py @@ -327,7 +327,7 @@ def sendMessageChannel( request, server, channelid, tree, message ): srv.sendMessageChannel(channelid, tree, message) @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. 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) ) - if "resync" in request.POST and request.POST['resync'] == "true": + if resync: srv.readUsersFromMurmur() if not srv.isUserAdmin( request.user ):