Added new features

README.rst

@@ -51,11 +51,27 @@ There are a few optional settings available:
     Default: False. If set to True, an email will be sent each time a user
     provides feedback.
 
-``FEEDBACK_EMAIL_TO``
+``FEEDBACK_TO_EMAIL``
 
-    Default: ``settings.DEFAULT_FROM_EMAIL``. The email address to which
+    Default: None. The email addresses to which
     feedback emails should be sent.
 
+``FEEDBACK_HEADER_FILTER``
+
+    Default: see feedback.views for details. The http headers that will be
+    stored in the headers field.
+
+``FEEDBACK_FLASH_MESSAGE``
+
+    Default: False. If True and django.messages installed it adds a
+    flash message to the user.
+
+``FEEDBACK_SUCCESS_URL``
+
+    Default: /. The default URL to which to send the user for successful
+    feedback.
+
+
 There are also two additional templates ``feedback/email/body.txt`` and
 ``feedback/email/subject.txt`` which control the output formatting for the
 email messages.

feedback/admin.py

@@ -4,9 +4,21 @@
 
 class FeedbackAdmin(admin.ModelAdmin):
     date_hierarchy = 'timestamp'
-    list_display = ('user', 'feedback', 'timestamp', 'resolved', 'publish')
-    list_editable = ('resolved', 'publish')
-    list_filter = ('user', 'resolved', 'publish')
-    search_fields = ['feedback', 'user']
+    readonly_fields = ('url', 'email', 'user', 'timestamp', 'headers', \
+        'ip_address')
+
+    list_display = ('get_user', 'get_feedback', 'timestamp', 'type', \
+        'resolved')
+
+    list_editable = ('resolved',)
+    list_filter = ('resolved', 'type', 'timestamp')
+    search_fields = ['feedback', 'email']
+
+
+    def get_user(self, object):
+        return object.user if object.user else 'Anonymous'
+
+    def get_feedback(self, object):
+        return object.feedback[:100]
 
 admin.site.register(Feedback, FeedbackAdmin)

feedback/context_processors.py

@@ -1,4 +1,8 @@
 from feedback.forms import FeedbackForm
 
 def feedback_form(request):
-    return {'feedback_form': FeedbackForm()}
+    return {'feedback_form': FeedbackForm(
+        initial={'email':request.user.email \
+            if hasattr(request, 'user') and request.user.is_authenticated() and \
+                request.user.email else None}
+    )}

feedback/forms.py

@@ -1,8 +1,23 @@
 from django import forms
 
-from feedback.models import Feedback
+from feedback.models import Feedback, FEEDBACK_TYPES
 
 class FeedbackForm(forms.ModelForm):
     class Meta:
         model = Feedback
-        exclude = ("user", "url", "resolved", "publish",)
+        fields = ('type', 'email', 'feedback',)
+
+    type = forms.ChoiceField(choices=FEEDBACK_TYPES, 
+        initial=FEEDBACK_TYPES[0][0], widget=forms.RadioSelect(attrs={
+            'id':'feedback_type_id',
+            #'class': 'pseudo-popup_input',
+        }))
+    email = forms.EmailField(widget=forms.TextInput(attrs={
+            'id':'feedback_email_id', 
+            'class':'pseudo-popup_input',
+        }))
+    feedback = forms.CharField(widget=forms.Textarea(attrs={
+            'id':'feedback_feedback_id', 
+            'class':'pseudo-popup_input',
+            'rows': '4',
+        }))

feedback/locale/ru/LC_MESSAGES/django.po

@@ -0,0 +1,49 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-03-29 11:47+0400\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: models.py:8
+msgid "Bug"
+msgstr "Ошибка"
+
+#: models.py:9
+msgid "Feature"
+msgstr "Предложение"
+
+#: models.py:10
+msgid "Support request"
+msgstr "Нужна помощь"
+
+#: models.py:23
+msgid "IP address"
+msgstr ""
+
+#: models.py:27
+msgid "Feedback"
+msgstr ""
+
+#: models.py:30
+#, python-format
+msgid "Feedback from %(user)s sent %(date)s"
+msgstr ""
+
+#: views.py:73
+msgid "Your feedback has been sent. Thank you!"
+msgstr "Мы получили ваше послание, спасибо!"

feedback/migrations/0003_auto__del_field_feedback_publish__add_field_feedback_email__add_field_.py

@@ -0,0 +1,84 @@
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+
+        # Deleting field 'Feedback.publish'
+        db.delete_column('feedback_feedback', 'publish')
+
+        # Adding field 'Feedback.email'
+        db.add_column('feedback_feedback', 'email', self.gf('django.db.models.fields.EmailField')(max_length=75, null=True, blank=True), keep_default=False)
+
+        # Adding field 'Feedback.headers'
+        db.add_column('feedback_feedback', 'headers', self.gf('django.db.models.fields.TextField')(null=True, blank=True), keep_default=False)
+
+
+    def backwards(self, orm):
+
+        # Adding field 'Feedback.publish'
+        db.add_column('feedback_feedback', 'publish', self.gf('django.db.models.fields.BooleanField')(default=False), keep_default=False)
+
+        # Deleting field 'Feedback.email'
+        db.delete_column('feedback_feedback', 'email')
+
+        # Deleting field 'Feedback.headers'
+        db.delete_column('feedback_feedback', 'headers')
+
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'feedback.feedback': {
+            'Meta': {'ordering': "['-timestamp']", 'object_name': 'Feedback'},
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
+            'feedback': ('django.db.models.fields.TextField', [], {}),
+            'headers': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'resolved': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'timestamp': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'type': ('django.db.models.fields.CharField', [], {'max_length': '128', 'blank': 'True'}),
+            'url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['feedback']

feedback/migrations/0004_auto__add_field_feedback_ip_address.py

@@ -0,0 +1,73 @@
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+
+        # Adding field 'Feedback.ip_address'
+        db.add_column('feedback_feedback', 'ip_address', self.gf('django.db.models.fields.IPAddressField')(max_length=15, null=True, blank=True), keep_default=False)
+
+
+    def backwards(self, orm):
+
+        # Deleting field 'Feedback.ip_address'
+        db.delete_column('feedback_feedback', 'ip_address')
+
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'feedback.feedback': {
+            'Meta': {'ordering': "['-timestamp']", 'object_name': 'Feedback'},
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
+            'feedback': ('django.db.models.fields.TextField', [], {}),
+            'headers': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ip_address': ('django.db.models.fields.IPAddressField', [], {'max_length': '15', 'null': 'True', 'blank': 'True'}),
+            'resolved': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'timestamp': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'type': ('django.db.models.fields.CharField', [], {'max_length': '128', 'blank': 'True'}),
+            'url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['feedback']

feedback/models.py

@@ -1,25 +1,31 @@
 from django.conf import settings
 from django.db import models
 from django.contrib.auth.models import User
+from django.utils.translation import ugettext_lazy as _
+
 
 FEEDBACK_TYPES = (
-    ('bug', 'Bug'),
-    ('feature', 'Feature'),
-    ('support', 'Support request'),
+    ('bug', _('Bug')),
+    ('feature', _('Feature')),
+    ('support', _('Support request')),
 )
 
 class Feedback(models.Model):
     feedback = models.TextField()
     user = models.ForeignKey(User, null=True, blank=True)
+    email = models.EmailField(blank=True, null=True)
     url = models.URLField(blank=True, verify_exists=False)
     timestamp = models.DateTimeField(auto_now_add=True, editable=False)
     resolved = models.BooleanField(default=False)
-    publish = models.BooleanField(default=False)
-    type = models.CharField(max_length=128, blank=True, choices=getattr(settings, 'FEEDBACK_TYPES', FEEDBACK_TYPES))
+    type = models.CharField(max_length=128, blank=True, \
+        choices=getattr(settings, 'FEEDBACK_TYPES', FEEDBACK_TYPES))
+    headers = models.TextField(blank=True, null=True)
+    ip_address  = models.IPAddressField(_('IP address'), blank=True, null=True)
 
     class Meta:
         ordering = ['-timestamp',]
-        verbose_name_plural = "Feedback"
+        verbose_name_plural = _('Feedback')
 
     def __unicode__(self):
-        return "Feedback from %s sent %s" % (self.user, self.timestamp,)
+        return _('Feedback from %(user)s sent %(date)s') % \
+            {'user':self.user if self.user else 'Anonymous', 'date': self.timestamp}

feedback/templates/feedback/email/body.txt

@@ -3,4 +3,8 @@ Page URL: {{ feedback.url|default:"URL not available" }}
 User: {% if feedback.user %}{{ feedback.user.get_full_name }} ({{ feedback.user.username }}){% else %}Anonymous{% endif %}
 
 Feedback:
-{{ feedback.feedback }}
+{{ feedback.feedback }}
+
+Headers:
+{{ feedback.headers }}
+

feedback/templates/feedback/email/subject.txt

@@ -1 +1 @@
-Feedback from {{ feedback.user }}
+Feedback from {% if feedback.user %}{{ feedback.user }}{% else %}anonymous user{% endif %}

feedback/templates/feedback/form.html

@@ -1,4 +1,6 @@
 <form action='{% url django-user-feedback %}' method='POST'>{% csrf_token %}
+
     {{ feedback_form.as_p }}
+
     <button type='submit'>Submit</button>
 </form>