diff options
| -rw-r--r-- | ishtar_common/admin.py | 4 | ||||
| -rw-r--r-- | ishtar_common/templates/account_activation_email.txt | 2 | ||||
| -rw-r--r-- | ishtar_common/wizards.py | 3 |
3 files changed, 7 insertions, 2 deletions
diff --git a/ishtar_common/admin.py b/ishtar_common/admin.py index a5d9624ee..2adbebd3d 100644 --- a/ishtar_common/admin.py +++ b/ishtar_common/admin.py @@ -25,6 +25,8 @@ from django.conf import settings from django.contrib import admin from django.contrib.auth.admin import GroupAdmin, UserAdmin from django.contrib.auth.models import Group, User +from django.contrib.sites.admin import SiteAdmin +from django.contrib.sites.models import Site from django.contrib.gis.forms import PointField, OSMWidget from django.http import HttpResponseRedirect, HttpResponse from django.shortcuts import render @@ -125,8 +127,10 @@ class MyGroupAdmin(GroupAdmin): "all": ("media/admin.css",) } + admin_site.register(User, UserAdmin) admin_site.register(Group, MyGroupAdmin) +admin_site.register(Site, SiteAdmin) class IshtarSiteProfileAdmin(admin.ModelAdmin): diff --git a/ishtar_common/templates/account_activation_email.txt b/ishtar_common/templates/account_activation_email.txt index 2dcc77d3e..7498a86c7 100644 --- a/ishtar_common/templates/account_activation_email.txt +++ b/ishtar_common/templates/account_activation_email.txt @@ -5,7 +5,7 @@ * {% trans "Login:" %} {{login}} * {% trans "Password:" %} {{password}} -{% trans "You can log in here:" %} http://{{site}}{%url auth_login%} +{% trans "You can log in here:" %} {{scheme}}://{{site}}{% url "auth_login" %} {% trans "Thank you for you interest in the project." %} diff --git a/ishtar_common/wizards.py b/ishtar_common/wizards.py index f522188a8..701f6eca3 100644 --- a/ishtar_common/wizards.py +++ b/ishtar_common/wizards.py @@ -1426,7 +1426,8 @@ class AccountWizard(Wizard): 'login': dct['username'], 'password': dct['password'], 'app_name': app_name, - 'site': site and site.domain or "" + 'site': site and site.domain or "", + "scheme": self.request.scheme } t = loader.get_template('account_activation_email.txt') msg = t.render(context, self.request) |