Fixed top redirection.

see #1019
This commit is contained in:
Antoine Nguyen
2017-02-08 10:16:43 +01:00
parent 0fbb6aaade
commit de342d0622
4 changed files with 8 additions and 5 deletions
+4 -2
View File
@@ -20,9 +20,11 @@ def enabled_applications():
"""Return the list of installed extensions."""
from modoboa.core.extensions import exts_pool
result = [("user", "user")]
result = [("user", _("User profile"))]
for extension in exts_pool.list_all():
result.append((extension["name"], extension["name"]))
if not extension["topredirection_url"]:
continue
result.append((extension["name"], extension["label"]))
return sorted(result, key=lambda e: e[0])
+2 -1
View File
@@ -19,13 +19,14 @@ class ModoExtension(object):
url = None
needs_media = False
always_active = False
available_for_topredirection = False
topredirection_url = None
def infos(self):
"""Information about this extension."""
return {
"name": self.name, "label": self.label, "version": self.version,
"description": self.description, "url": self.url,
"topredirection_url": self.topredirection_url,
"always_active": self.always_active
}
+1 -1
View File
@@ -75,7 +75,7 @@ dologin = never_cache(dologin)
def dologout(request):
"""Logout current user."""
if not request.user.is_anonymous():
signals.user_logout.send(sender="dologout")
signals.user_logout.send(sender="dologout", request=request)
logger = logging.getLogger("modoboa.auth")
logger.info(_("User {} logged out").format(request.user.username))
logout(request)
+1 -1
View File
@@ -20,7 +20,7 @@ def find_nextlocation(request, user):
"default_top_redirection")
if topredir != "user":
infos = exts_pool.get_extension_infos(topredir)
nextlocation = infos["url"] if infos["url"] else infos["name"]
nextlocation = infos["topredirection_url"]
else:
nextlocation = reverse("core:user_index")
else: