evaluating the queryset submitted to autopaginate ahead of the tag is a lost of perfo...

diff --git a/docs/conf.py b/docs/conf.py
index 11ce12910c198421ec55aff4276d1137dd69e563..d935545b5118a10b83dbfdb916aaa8e1d58e00ed 100644 (file)
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -45,9 +45,9 @@ copyright = u'2010, Patrick Samson'
 # built documents.\r
 #\r
 # The short X.Y version.\r
-version = '1.1'\r
+version = '1.2'\r
 # The full version, including alpha/beta/rc tags.\r
-release = '1.1'\r
+release = '1.2'\r
 \r
 # The language for content autogenerated by Sphinx. Refer to documentation\r
 # for a list of supported languages.\r

diff --git a/postman/__init__.py b/postman/__init__.py
index 06d9f561e446507a571afc65a37bfd850ae234e7..886fccf733e83bb3da32007bb833b9eb90f5bf17 100644 (file)
--- a/postman/__init__.py
+++ b/postman/__init__.py
@@ -1,7 +1,7 @@
 """A messaging application for Django"""
 
 # following PEP 386: N.N[.N]+[{a|b|c|rc}N[.N]+][.postN][.devN]
-VERSION = (1, 1, 0)
+VERSION = (1, 2, 0)
 PREREL = ()
 POST = 0
 DEV = 0

diff --git a/postman/templates/postman/base_folder.html b/postman/templates/postman/base_folder.html
index 700faafe52e5e882d2d5f749a9fed939e9a72187..7ca4e1182bc58170cc41b6d245915f4503d627f2 100644 (file)
--- a/postman/templates/postman/base_folder.html
+++ b/postman/templates/postman/base_folder.html
@@ -3,11 +3,11 @@
 {% block content %}
 <div id="postman">
 <h1>{% block pm_folder_title %}{% endblock %}</h1>
-{% if pm_messages %}
 {% autopaginate pm_messages %}
 {% if invalid_page %}
 <p>{% trans "Sorry, this page number is invalid." %}</p>
 {% else %}
+{% if pm_messages %}
 {% block pm_by_modes %}<div id="pm_by_modes">
 <span class="pm_by_mode">{% if by_message %}<a href="{{ by_conversation_url }}">{% endif %}{% trans "by conversation" %}{% if by_message %}</a>{% endif %}</span>
 <span class="pm_by_mode">{% if by_conversation %}<a href="{{ by_message_url }}">{% endif %}{% trans "by message" %}{% if by_conversation %}</a>{% endif %}</span>
@@ -46,10 +46,10 @@
 </table>
 </form>
 {% paginate %}
-{% endif %}
 {% else %}
 <p>{% trans "No messages." %}</p>
 {% endif %}
+{% endif %}
 {% block pm_footer_info %}{% endblock %}
 </div>
 {% endblock content %}
\ No newline at end of file

diff --git a/postman/tests.py b/postman/tests.py
index 40c4d4d713657a8e81735009bcf5bbd1bc38a59e..9eeb3752168d48bbabc72540df338c4600682062 100644 (file)
--- a/postman/tests.py
+++ b/postman/tests.py
@@ -70,7 +70,7 @@ class GenericTest(TestCase):
     Usual generic tests.
     """
     def test_version(self):
-        self.assertEqual(sys.modules['postman'].__version__, "1.1.0")
+        self.assertEqual(sys.modules['postman'].__version__, "1.2.0")
 
 class BaseTest(TestCase):
     """