Merge branch 'production'

* production:
  Don't load the uri template tag library.
  Add the influence url to notification emails.
  Make the is_public field unchecked by default.

diff --git a/influences/forms.py b/influences/forms.py
index e1a6db381f29159742c9aef477491bab3b0e3b63..db825cc018362760833c0c2e74a44a11c582e8e4 100644 (file)
--- a/influences/forms.py
+++ b/influences/forms.py
@@ -1,4 +1,4 @@
-from django.forms.fields import CharField
+from django.forms.fields import CharField, BooleanField
 from django.forms.widgets import Textarea
 from django.forms.models import ModelMultipleChoiceField
 from threadedcomments.forms import ThreadedCommentForm
@@ -25,6 +25,7 @@ class InfluenceCommentForm(ThreadedCommentForm):
 
 class AdminInfluenceCommentForm(ThreadedCommentForm):
     comment = CharField(widget=Textarea(attrs={'cols' : 80}))
+    is_public = BooleanField(required=False, initial=False)
     def __init__(self, *args, **kwargs):
         super(AdminInfluenceCommentForm, self).__init__(*args, **kwargs)
 

diff --git a/locale/nl/LC_MESSAGES/django.po b/locale/nl/LC_MESSAGES/django.po
index ed0d963414e4bf0c60a2efb1a5ff0734b72a30b9..c8258eecd6605f4401870fad4370a5ee7693d68b 100644 (file)
--- a/locale/nl/LC_MESSAGES/django.po
+++ b/locale/nl/LC_MESSAGES/django.po
@@ -499,6 +499,11 @@ msgstr ""
 msgid "The influence has been modified. The current status is"
 msgstr "De invloed is veranderd. De status is nu"
 
+#: templates/influences/email/influence_changed.html:46
+#: templates/influences/email/influence_comment_added.html:26
+msgid "View the influence and comments here:"
+msgstr "Bekijk de invloed en het commentaar hier:"
+
 #: templates/influences/email/influence_comment_added.html:6
 #, python-format
 msgid "Comment added to influence \"%(influence)s\"."

diff --git a/templates/influences/email/influence_changed.html b/templates/influences/email/influence_changed.html
index ac59c93f60db0062846511b0b7a4dd21b56dbae4..982bf1ed0cac6f9d04293658ea5c2ffd7a67d91e 100644 (file)
--- a/templates/influences/email/influence_changed.html
+++ b/templates/influences/email/influence_changed.html
@@ -44,5 +44,9 @@ You are involved in this influence, submitted on {{ creation_date }}.
 {{ influence.result }}
 {% endfilter %}
 {% endif %}
+\\
+\\
+{% trans "View the influence and comments here:" %}
+http://xerxes.evolution-events.nl{{ influence.get_absolute_url }}
 {% endautoescape %}
 {% endgapless %}

diff --git a/templates/influences/email/influence_comment_added.html b/templates/influences/email/influence_comment_added.html
index 656f16346caf48434cf98f1da908f96ccf7b3a6c..d52cce2f1908b4095fc3389c071029dfa788622c 100644 (file)
--- a/templates/influences/email/influence_comment_added.html
+++ b/templates/influences/email/influence_comment_added.html
@@ -18,5 +18,11 @@ Subject: {% blocktrans %}Comment added to influence "{{ influence }}".{% endbloc
 \\
 {{comment.comment}}
 {% endfilter %}
+\\
+\\
+{# This is ugly and hardcoded, but we don't have access to the request #}
+{# when notifying currently, so this should do for now. #}
+{% trans "View the influence and comments here:" %}
+http://xerxes.evolution-events.nl{{ influence.get_absolute_url }}
 {% endautoescape %}
 {% endgapless %}