From 1615f79b8817706ab3d717fdb2ffcf914302839a Mon Sep 17 00:00:00 2001 From: Andrew Williams Date: Thu, 2 Sep 2010 22:13:08 +0100 Subject: [PATCH] Added api call to pull Murmur Objects --- sso/services/mumble/MumbleCtlIce.py | 5 +++++ sso/services/mumble/__init__.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/sso/services/mumble/MumbleCtlIce.py b/sso/services/mumble/MumbleCtlIce.py index f6208f3..89dfe9b 100644 --- a/sso/services/mumble/MumbleCtlIce.py +++ b/sso/services/mumble/MumbleCtlIce.py @@ -179,6 +179,11 @@ class MumbleCtlIce_118(MumbleCtlBase): self.proxy = connstring; self.meta = meta; + @protectDjangoErrPage + def getMurmurObj(self, objname): + if hasattr(Murmur, objname): + return getattr(Murmur, objname) + @protectDjangoErrPage def _getIceServerObject(self, srvid): return self.meta.getServer(srvid); diff --git a/sso/services/mumble/__init__.py b/sso/services/mumble/__init__.py index 4696d5c..e3b8891 100644 --- a/sso/services/mumble/__init__.py +++ b/sso/services/mumble/__init__.py @@ -97,7 +97,7 @@ class MumbleService(BaseService): newgroups = False for agroup in groups: if not agroup.name.replace(' ', '').lower() in glist: - group = Murmur.Group() + group = self.mumblectl.getMurmurObj('Group') group.name = group.name.replace(' ', '').lower() group.inheritable = True group.inherit = True