Changeset 260:18ef57131652

Timestamp:

27.06.2010 21:08:10 (20 months ago)

Author:

alafin

Branch:

default

Children:

261:34fbc2b3b032, 265:37965e9f9146

Message:

implement #67 Replacing PM by django-messages

Location:

djangobb

Files:

• djangobb_forum/templates/forum/header.html (modified) (2 diffs)
• djangobb_forum/templates/forum/pm/base_pm.html (deleted)
• djangobb_forum/templates/forum/pm/create_pm.html (deleted)
• djangobb_forum/templates/forum/pm/inbox.html (deleted)
• djangobb_forum/templates/forum/pm/menu_pm.html (deleted)
• djangobb_forum/templates/forum/pm/message.html (deleted)
• djangobb_forum/templates/forum/pm/outbox.html (deleted)
• djangobb_forum/templates/forum/topic.html (modified) (1 diff)
• djangobb_forum/templatetags/forum_extras.py (modified) (2 diffs)
• djangobb_forum/urls.py (modified) (1 diff)
• settings.py (modified) (1 diff)
• templates/messages/base_pm.html (added)
• templates/messages/compose.html (added)
• templates/messages/inbox.html (added)
• templates/messages/menu_pm.html (added)
• templates/messages/outbox.html (added)
• urls.py (modified) (2 diffs)

djangobb/djangobb_forum/templates/forum/header.html

@@ -23 +23 @@
                                         <li id="navprofile"><a href="{% url djangobb:forum_profile request.user %}">{% trans "Profile" %}</a></li>
                                 {% if forum_settings.PM_SUPPORT %}
-                                        <li id="navpm"><a href="{% url djangobb:forum_pm_inbox %}">{% trans "PM" %}</a></li> 
+                                        <li id="navpm"><a href="{% url messages_inbox %}">{% trans "PM" %}</a></li> 
                                 {% endif %}
                                         <li id="navlogout"><a href="{% url user_signout %}?next={{ request.path }}">{% trans "Log out" %}</a></li>
@@ -37 +37 @@
                                         <li>{% trans "Logged in as" %} <strong>{{ user.username }}</strong></li>
                                         <li>{% trans "Last visit:" %} {% forum_time user.last_login %}</li>
-                                        {% if request.user|pm_unreads %}
-                                                <ul><li class="pmlink"><strong><a href="{% url djangobb:forum_pm_inbox %}">{% blocktrans with request.user|pm_unreads as new_msg %} There are new messages ({{ new_msg }}){% endblocktrans %}</a></strong></li></ul>
+                                        {% if forum_settings.PM_SUPPORT and request.user|pm_unreads %}
+                                                <ul><li class="pmlink"><strong><a href="{% url messages_inbox %}">{% blocktrans with request.user|pm_unreads as new_msg %} There are new messages ({{ new_msg }}){% endblocktrans %}</a></strong></li></ul>
                                         {% endif %}
                                 {% else %}

djangobb/djangobb_forum/templates/forum/topic.html

@@ -73 +73 @@
                                                 {% if forum_settings.PM_SUPPORT %}
                                                         {% if user.is_authenticated %}
-                                                                <a href="{% url djangobb:forum_create_pm %}?recipient={{ post.user.username }}">{% trans "PM" %}</a>&nbsp;&nbsp;</dd>
+                                                                <a href="{% url messages_compose_to post.user %}">{% trans "PM" %}</a>&nbsp;&nbsp;</dd>
                                                         {% endif %}
                                                 {% endif %}

djangobb/djangobb_forum/templatetags/forum_extras.py

@@ -16 +16 @@
 from django.contrib.humanize.templatetags.humanize import naturalday
 
-from djangobb_forum.models import Forum, Topic, Post, PostTracking, PrivateMessage, Report
+from djangobb_forum.models import Forum, Topic, Post, PostTracking, Report
 from djangobb_forum import settings as forum_settings
+from messages.models import inbox_count_for
 
 register = template.Library()
@@ -233 +234 @@
 @register.filter
 def pm_unreads(user):
-    return PrivateMessage.objects.filter(dst_user=user, read=False).count()
+    return inbox_count_for(user)
 
 

djangobb/djangobb_forum/urls.py

@@ -64 +64 @@
     )
 
-# PM Extension
-if (forum_settings.PM_SUPPORT):
-    urlpatterns += patterns('',
-        url('^pm/new/$', forum_views.create_pm, name='forum_create_pm'),
-        url('^pm/outbox/$', forum_views.pm_outbox, name='forum_pm_outbox'),
-        url('^pm/inbox/$', forum_views.pm_inbox, name='forum_pm_inbox'),
-        url('^pm/show/(?P<pm_id>\d+)/$', forum_views.show_pm, name='forum_show_pm'),
-   )
-
 # REPUTATION Extension
 if (forum_settings.REPUTATION_SUPPORT):

djangobb/settings.py

@@ -122 +122 @@
     'djangobb_forum',
     'djapian',
+    'messages',
 )
 

djangobb/urls.py

@@ -6 +6 @@
 from sitemap import SitemapForum, SitemapTopic
 from forms import RegistrationFormUtfUsername
+from djangobb_forum import settings as forum_settings
 
 # HACK for add default_params with RegistrationFormUtfUsername and backend to registration urlpattern
@@ -37 +38 @@
 )
 
+# PM Extension
+if (forum_settings.PM_SUPPORT):
+    urlpatterns += patterns('',
+        (r'^forum/pm/', include('messages.urls')),
+   )
+
 if (settings.DEBUG):
     urlpatterns += patterns('',