diff options
| -rw-r--r-- | chimere/forms.py | 6 | ||||
| -rw-r--r-- | chimere/views.py | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/chimere/forms.py b/chimere/forms.py index ed6b5d7..e7115a5 100644 --- a/chimere/forms.py +++ b/chimere/forms.py @@ -24,6 +24,7 @@ from django import forms from django.conf import settings from django.contrib.gis.db import models from django.core.exceptions import ImproperlyConfigured +from django.core.urlresolvers import reverse from django.forms.formsets import formset_factory from django.utils.translation import ugettext as _ from django.contrib.auth.models import User, Permission, ContentType @@ -70,13 +71,14 @@ def notifyStaff(subject, body, sender=None): return False return True -def notifySubmission(geo_object): +def notifySubmission(absolute_uri, geo_object): category = u" - ".join([unicode(cat) for cat in geo_object.categories.all()]) subject = u'%s %s' % (_(u"New submission for"), category) message = _(u'The new item "%s" has been submited in the category: ') % \ geo_object.name + category message += "\n\n" + _(u"To valid, precise or unvalid this item: ") - message += settings.BASE_URL + 'admin' + named_url = 'admin:chimere_%s_change'% geo_object.__class__.__name__.lower() + message += absolute_uri + reverse(named_url, args=(geo_object.pk,)) message += u"\n\n--\nChimère" return notifyStaff(subject, message) diff --git a/chimere/views.py b/chimere/views.py index f2271e7..5068698 100644 --- a/chimere/views.py +++ b/chimere/views.py @@ -193,8 +193,12 @@ def get_edit_page(redirect_url, item_cls, item_form): for f in formset_picture: f.save(item) - - notifySubmission(item) + base_uri = 'http://' + if 'SERVER_NAME' in request.META: + base_uri += request.META['SERVER_NAME'] + if 'SERVER_PORT' in request.META: + base_uri += ":" + request.META['SERVER_PORT'] + notifySubmission(base_uri, item) response_dct = get_base_response(area_name) return redirect(redirect_url + '-item', area_name + '/' if area_name else '', |