Add message search to postman

diff --git a/teleforma/apps.py b/teleforma/apps.py
new file mode 100644 (file)
index 0000000..d605d2a
--- /dev/null
+++ b/teleforma/apps.py
@@ -0,0 +1,9 @@
+from django.apps import AppConfig
+
+
+class TeleformaConfig(AppConfig):
+    name = "teleforma"
+    verbose_name = "Teleforma"
+
+    def ready(self):
+        from . import postman

diff --git a/teleforma/postman.py b/teleforma/postman.py
new file mode 100644 (file)
index 0000000..67cabdb
--- /dev/null
+++ b/teleforma/postman.py
@@ -0,0 +1,61 @@
+# some patches for postman
+
+from django.db import models
+from django.db.models.expressions import RawSQL
+from django.db.models.query import QuerySet
+from django.utils.translation import gettext_lazy as _
+from django.db.models import IntegerField, Value
+
+from postman.query import PostmanQuery
+from postman.models import MessageManager, OPTION_MESSAGES
+
+MessageManager._folder_old = MessageManager._folder
+
+def _folder(self, related, filters, option=None, order_by=None, query_dict=None):
+    """Base code, in common to the folders."""
+    search = None
+    if query_dict:
+        search = query_dict.get('search')
+    qs = self.all() if option == OPTION_MESSAGES else QuerySet(self.model, PostmanQuery(self.model), using=self._db)
+    if related:
+        qs = qs.select_related(*related)
+    if order_by:
+        qs = qs.order_by(order_by)
+    if isinstance(filters, (list, tuple)):
+        lookups = models.Q()
+        for filter in filters:
+            lookups |= models.Q(**filter)
+    else:
+        lookups = models.Q(**filters)
+
+    if search:
+        lookups &= models.Q(subject__icontains=search)\
+                | models.Q(body__icontains=search)\
+                | models.Q(sender__username__icontains=search)\
+                | models.Q(sender__first_name__icontains=search)\
+                | models.Q(sender__last_name__icontains=search)
+    if option == OPTION_MESSAGES:
+        qs = qs.filter(lookups)
+        # Adding a 'count' attribute, to be similar to the by-conversation case,
+        # should not be necessary. Otherwise add:
+        # .extra(select={'count': 'SELECT 1'})
+    else:
+        qs = qs.annotate(count=RawSQL('{0}.count'.format(qs.query.pm_alias_prefix), ()))
+        qs.query.pm_set_extra(table=(
+            self.filter(lookups, thread_id__isnull=True).annotate(count=Value(0, IntegerField()))\
+                .values_list('id', 'count').order_by(),
+            # use separate annotate() to keep control of the necessary order
+            self.filter(lookups, thread_id__isnull=False).values('thread').annotate(id=models.Max('pk')).annotate(count=models.Count('pk'))\
+                .values_list('id', 'count').order_by(),
+        ))
+    if query_dict:
+        limit = query_dict.get('limit')
+        if limit:  # at end because doc says "Further filtering or ordering of a sliced queryset is prohibited..."
+            try:
+                i = int(limit)
+                qs = qs[:i]
+            except:  # just ignore any bad format
+                pass
+    return qs
+
+MessageManager._folder = _folder
\ No newline at end of file

diff --git a/teleforma/templates/postman/base_folder.html b/teleforma/templates/postman/base_folder.html
index 376cc00305f732bbec51f78d838cf4deb2b434bb..b89b7381f1db7f287bdbcf9504fcb5a4f7759d41 100644 (file)
--- a/teleforma/templates/postman/base_folder.html
+++ b/teleforma/templates/postman/base_folder.html
@@ -8,10 +8,18 @@
 <div id="postman" class="desk_messages">
 
 {% block pm_by_modes %}
-<div id="pm_by_modes" style="float: right;">
-<a href="{{ by_conversation_url }}" class="component_icon button icon_filter">{% trans "by conversation" %}</a>
-<a href="{{ by_message_url }}" class="component_icon button icon_filter">{% trans "by message" %}</a>
+
+<div style="float:right; display:flex; align-items:center">
+  <form action="" method="GET">
+      <input type="text" name="search" value="{{ request.GET.search }}" placeholder="Recherche" />
+      <input type="submit" value="Ok" />
+  </form>
+  <div id="pm_by_modes">
+    <a href="{{ by_conversation_url }}" class="component_icon button icon_filter">{% trans "by conversation" %}</a>
+    <a href="{{ by_message_url }}" class="component_icon button icon_filter">{% trans "by message" %}</a>
+  </div>
 </div>
+
 {% endblock pm_by_modes %}
 <h1>{% block pm_folder_title %}{% endblock %}</h1>
 {% if invalid_page %}
@@ -36,7 +44,7 @@
 <table id="pm_messages" class="listing" >
  <thead>
   <tr>
-   <th>{% trans "Action" %}</th>
+   <th><input type="checkbox" class="select_all" />{% trans "Action" %}</th>
 {% block pm_sender_header %}   <th><a href="{% postman_order_by sender %}">{% trans "Sender" %}</a></th>{% endblock %}
 {% block pm_recipient_header %}   <th><a href="{% postman_order_by recipient %}">{% trans "Recipient" %}</a></th>{% endblock %}
    <th><a href="{% postman_order_by subject %}">{% trans "Subject" %}</a></th>