From: Patrick Samson <pk.samson@gmail.com>
Date: Mon, 17 Dec 2012 13:19:01 +0000 (+0100)
Subject: Avoid the 'Enter text to search.' help text imposed in version 1.2.5 of ajax_select
X-Git-Tag: 3.0.0~12
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=a4c9595206320a21966edbd187923f467a52aae8;p=django-postman.git

Avoid the 'Enter text to search.' help text imposed in version 1.2.5 of ajax_select
---

diff --git a/docs/conf.py b/docs/conf.py
index e94905b..3d57c3e 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -45,9 +45,9 @@ copyright = u'2010, Patrick Samson'
 # built documents.
 #
 # The short X.Y version.
-version = '2.1'
+version = '2.2'
 # The full version, including alpha/beta/rc tags.
-release = '2.1.1'
+release = '2.2.0a1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/postman/__init__.py b/postman/__init__.py
index 7fb2f66..7961887 100644
--- a/postman/__init__.py
+++ b/postman/__init__.py
@@ -4,8 +4,8 @@ A messaging application for Django
 from __future__ import unicode_literals
 
 # following PEP 386: N.N[.N]+[{a|b|c|rc}N[.N]+][.postN][.devN]
-VERSION = (2, 1, 1)
-PREREL = ()
+VERSION = (2, 2, 0)
+PREREL = ('a', 1)
 POST = 0
 DEV = 0
 
diff --git a/postman/forms.py b/postman/forms.py
index 685c466..b0ca4d1 100644
--- a/postman/forms.py
+++ b/postman/forms.py
@@ -152,7 +152,8 @@ class BaseWriteForm(forms.ModelForm):
 
 class WriteForm(BaseWriteForm):
     """The form for an authenticated user, to compose a message."""
-    recipients = CommaSeparatedUserField(label=(_("Recipients"), _("Recipient")))
+    # specify help_text only to avoid the possible default 'Enter text to search.' of ajax_select v1.2.5
+    recipients = CommaSeparatedUserField(label=(_("Recipients"), _("Recipient")), help_text='')
 
     class Meta(BaseWriteForm.Meta):
         fields = ('recipients', 'subject', 'body')
@@ -165,7 +166,7 @@ class AnonymousWriteForm(BaseWriteForm):
     can_overwrite_limits = False
 
     email = forms.EmailField(label=_("Email"))
-    recipients = CommaSeparatedUserField(label=(_("Recipients"), _("Recipient")), max=1)  # one recipient is enough
+    recipients = CommaSeparatedUserField(label=(_("Recipients"), _("Recipient")), help_text='', max=1)  # one recipient is enough
 
     class Meta(BaseWriteForm.Meta):
         fields = ('email', 'recipients', 'subject', 'body')
@@ -202,7 +203,8 @@ allow_copies = not getattr(settings, 'POSTMAN_DISALLOW_COPIES_ON_REPLY', False)
 class FullReplyForm(BaseReplyForm):
     """The complete reply form."""
     if allow_copies:
-        recipients = CommaSeparatedUserField(label=(_("Additional recipients"), _("Additional recipient")), required=False)
+        recipients = CommaSeparatedUserField(
+            label=(_("Additional recipients"), _("Additional recipient")), help_text='', required=False)
 
     class Meta(BaseReplyForm.Meta):
         fields = (['recipients'] if allow_copies else []) + ['subject', 'body']
diff --git a/postman/tests.py b/postman/tests.py
index 3f813da..9bf3f24 100644
--- a/postman/tests.py
+++ b/postman/tests.py
@@ -76,7 +76,7 @@ class GenericTest(TestCase):
     Usual generic tests.
     """
     def test_version(self):
-        self.assertEqual(sys.modules['postman'].__version__, "2.1.1")
+        self.assertEqual(sys.modules['postman'].__version__, "2.2.0a1")
 
 
 class BaseTest(TestCase):