mirror of
https://github.com/jwinterm/modoboa.git
synced 2026-10-18 05:51:26 +02:00
+2
-2
@@ -45,8 +45,8 @@ def enabled_applications():
|
||||
exts = list(Extension.objects.filter(enabled=True))
|
||||
except DatabaseError:
|
||||
exts = []
|
||||
result += map(lambda ext: (ext.name, ext.name), exts)
|
||||
return sorted(result)
|
||||
result += [(ext.name, ext.name) for ext in exts]
|
||||
return sorted(result, key=lambda e: e[0])
|
||||
|
||||
parameters.register_admin("DEFAULT_TOP_REDIRECTION", type="list", deflt="admin",
|
||||
app="general",
|
||||
|
||||
+3
-2
@@ -808,8 +808,9 @@ class Extension(models.Model):
|
||||
|
||||
def __init__(self, *args, **kwargs):
|
||||
super(Extension, self).__init__(*args, **kwargs)
|
||||
self.instance = exts_pool.get_extension(self.name)
|
||||
self.__get_ext_dir()
|
||||
if self.name:
|
||||
self.instance = exts_pool.get_extension(self.name)
|
||||
self.__get_ext_dir()
|
||||
|
||||
def __get_ext_dir(self):
|
||||
modname = self.instance.__module__
|
||||
|
||||
@@ -46,6 +46,10 @@ class ExtensionsPool(object):
|
||||
self.extensions[name]["instance"] = self.extensions[name]["cls"]()
|
||||
return self.extensions[name]["instance"]
|
||||
|
||||
def get_extension_infos(self, name):
|
||||
instance = self.get_extension(name)
|
||||
return instance.infos()
|
||||
|
||||
def load_all(self, prefix):
|
||||
from modoboa.admin.models import Extension
|
||||
|
||||
|
||||
+3
-3
@@ -148,12 +148,12 @@ def topredirection(request):
|
||||
:param request: a Request object
|
||||
"""
|
||||
from modoboa.lib import parameters
|
||||
from modoboa.extensions import get_extension_infos
|
||||
from modoboa.extensions import exts_pool
|
||||
|
||||
topredir = parameters.get_admin("DEFAULT_TOP_REDIRECTION", app="general")
|
||||
if not topredir in ["admin", "userprefs"]:
|
||||
infos = get_extension_infos(topredir)
|
||||
path = infos["url"]
|
||||
infos = exts_pool.get_extension_infos(topredir)
|
||||
path = infos["url"] if infos["url"] else infos["name"]
|
||||
else:
|
||||
path = topredir
|
||||
|
||||
|
||||
Reference in New Issue
Block a user