From 183cb97cc606d48c359507833db1a915d1ea4047 Mon Sep 17 00:00:00 2001
From: Luan <luanpab@gmail.com>
Date: Wed, 30 Oct 2013 16:58:04 -0200
Subject: [PATCH] Normalizing superarchives models #52

---
 src/accounts/templates/accounts/user_detail.html  |  4 ++--
 src/super_archives/models.py                      | 28 +++++++++++++++++++++++++---
 src/super_archives/templates/message-list.html    |  2 +-
 src/super_archives/templates/message-preview.html | 86 ++++++++++++++++++++++++++++++++++++++++++--------------------------------------------
 src/templates/home.html                           |  6 +++---
 src/templates/search/preview-search.html          | 53 -----------------------------------------------------
 src/templates/search/search.html                  |  2 +-
 7 files changed, 74 insertions(+), 107 deletions(-)
 delete mode 100644 src/templates/search/preview-search.html

diff --git a/src/accounts/templates/accounts/user_detail.html b/src/accounts/templates/accounts/user_detail.html
index ab68684..22a55df 100644
--- a/src/accounts/templates/accounts/user_detail.html
+++ b/src/accounts/templates/accounts/user_detail.html
@@ -91,7 +91,7 @@
         <h3>{% trans "Latest posted" %} </h3>
         <ul class="message-list">
         {% for doc in emails %}
-          {% include "message-preview.html" %}
+          {% include "message-preview.html" with result=doc %}
         {% empty %}
           <li>{% trans "There are no posts by this user so far." %}</li>
         {% endfor %}
@@ -102,7 +102,7 @@
         <h3>{% trans "Community inside participations" %}</h3>
         <ul class="message-list">
         {% for result in results %}
-          {% include "search/preview-search.html" %}
+          {% include "message-preview.html" %}
         {% empty %}
           <li>{% trans "No contributions of this user so far." %}</li>
         {% endfor %}
diff --git a/src/super_archives/models.py b/src/super_archives/models.py
index d91e10d..053e1fd 100644
--- a/src/super_archives/models.py
+++ b/src/super_archives/models.py
@@ -283,7 +283,7 @@ class Message(models.Model):
 
     @property
     def mailinglist(self):
-        if not self.thread or not self.thread.mailinglist:
+        if not self.thread:
             return None
 
         return self.thread.mailinglist
@@ -314,12 +314,12 @@ class Message(models.Model):
                                             self.thread.subject_token])
 
     @property
-    def Description(self):
+    def description(self):
         """Alias to self.body"""
         return self.body
 
     @property
-    def Title(self):
+    def title(self):
         """Alias to self.subject_clean"""
         return self.subject_clean
 
@@ -328,6 +328,28 @@ class Message(models.Model):
         """Alias to self.modified"""
         return self.received_time
 
+    @property
+    def tag(self):
+        if not self.thread:
+            return None
+        return self.mailinglist.name
+
+    @property
+    def author(self):
+        return self.from_address.get_full_name()
+
+    @property
+    def author_url(self):
+        return self.from_address.user.get_absolute_url()
+
+    @property
+    def icon_name(self):
+        return u'envelope'
+
+    @property
+    def type(self):
+        return u'thread'
+
 
 class MessageBlock(models.Model):
     message = models.ForeignKey(Message, related_name='blocks')
diff --git a/src/super_archives/templates/message-list.html b/src/super_archives/templates/message-list.html
index a416c95..251ef1d 100644
--- a/src/super_archives/templates/message-list.html
+++ b/src/super_archives/templates/message-list.html
@@ -50,7 +50,7 @@
     <div class="col-xs-12 col-sm-12 col-md-10 col-lg-10">
       <ul class="unstyled-list">
         {% for thread in threads.object_list %}
-          {% include "message-preview.html" with doc=thread.latest_message %}
+          {% include "message-preview.html" with result=thread.latest_message %}
         {% empty %}
           <br/><br/>
           <span>
diff --git a/src/super_archives/templates/message-preview.html b/src/super_archives/templates/message-preview.html
index ed61ce1..5e5d51b 100644
--- a/src/super_archives/templates/message-preview.html
+++ b/src/super_archives/templates/message-preview.html
@@ -1,55 +1,53 @@
 {% load i18n %}
+{% load highlight %}
 
-{% if doc.Title %}
 <li class="preview-message">
-  {% if doc.Type %}
-  <img alt="{{ doc.Type }}" title="{{ doc.Type }}"
-       src="{{ STATIC_URL }}img/{{ doc.Type }}.png" />
-  {% else %}
-      <span class="glyphicon glyphicon-envelope"></span>
-  {% endif %}
+<span class="glyphicon glyphicon-{{ result.icon_name }}" title="{{ result.type }}"></span>
 
-  {% if doc.mailinglist %}
-  <a href="{% url 'super_archives.views.list_messages' %}?list={{ doc.mailinglist }}">
-    <span class="label label-primary">{{ doc.mailinglist }}</span>
-  </a>
-  {% endif %}
-
-  <span class="subject">
-    <a href="{{ doc.url }}#msg-{{ doc.id }}"
-       {% if
-       title="{% filter striptags|truncatewords:50 %}
-                {{ doc.Description|escape }}
-              {% endfilter %}">
-      {{ doc.Title }}
-    </a>
-  </span>
-
-  <span class="quiet">-
-    {{ doc.Description|striptags }}
-  </span>
-
-  <div class="quiet">
-    <span class="pull-left">
-      {% if doc.from_address.user.get_absolute_url or doc.from_address.get_full_name or doc.last_author or doc.Creator %}
-        {% trans "by" %}
-      {% endif %}
+{% if result.tag %}
+<a href="{% firstof result.mailinglist_url result.url %}">
+  <span class="label label-primary">{{ result.tag }}</span>
+</a>
+{% endif %}
 
-      {% if doc.from_address.user.get_absolute_url %}
-      <a href="{{ doc.from_address.user.get_absolute_url }}">
-        {{ doc.from_address.user.get_full_name }}
-      </a>
-      {% elif doc.from_address.get_full_name %}
-        <span>{{ doc.from_address.get_full_name }}</span>
+{% if result.title %}
+  <a href="{{ result.url }}" {% if result.description %}title="{{ result.description|escape|truncatechars:200 }}"{% endif %}>
+    <span class="subject">
+      <!-- a striptags filter was raising an error here because using with highlight -->
+      {% if query %}
+        {% highlight result.title with query max_length "1000" %}
       {% else %}
-        {% firstof doc.last_author doc.Creator "" %}
+        {{ result.title }}
       {% endif %}
     </span>
+  </a>
+{% endif %}
 
-    <span class="pull-right">
-      {{ doc.modified|timesince }}
-      {% trans "ago" %}
-    </span>
+{% if result.description %}
+      <!-- a striptags filter was raising an error here because using with highlight -->
+  <span class="quiet">- {% if query %}{% highlight result.description with query max_length "150" %}{% else %}{{ result.description }}{% endif %}</span>
+{% endif %}
+
+{% if result.author or result.modified %}
+  <div class="quiet">
+    {% if result.author %}
+      <span class="pull-left">{% trans "by" %}
+        {% if result.author and result.author_url %}
+          <a href="{{ result.author_url }}">
+            {% if query %}
+              {% highlight result.author with query %}
+            {% else %}
+              {{ result.author }}
+            {% endif %}
+          </a>
+        {% else %}
+          <span>{{ result.author }}</span>
+        {% endif %}
+      </span>
+    {% endif %}
+    {% if result.modified %}
+    <span class="pull-right">{{ result.modified|timesince }} {% trans "ago" %}</span>
+    {% endif %}
   </div>
-</li>
 {% endif %}
+</li>
diff --git a/src/templates/home.html b/src/templates/home.html
index e6cb77d..7b2c042 100644
--- a/src/templates/home.html
+++ b/src/templates/home.html
@@ -22,7 +22,7 @@
       </a>
       <ul class="message-list">
         {% for result in latest_results %}
-          {% include "search/preview-search.html" %}
+          {% include "message-preview.html" %}
         {% endfor %}
       </ul>
       <a class="column-align"
@@ -50,7 +50,7 @@
       </a>
       <ul class="message-list">
         {% for thread in hottest_threads %}
-          {% include "message-preview.html" with doc=thread.latest_message %}
+          {% include "message-preview.html" with result=thread.latest_message %}
         {% endfor %}
       </ul>
       <a class="column-align"
@@ -70,7 +70,7 @@
       </a>
       <ul class="message-list">
         {% for thread in latest_threads %}
-          {% include "message-preview.html" with doc=thread.latest_message %}
+          {% include "message-preview.html" with result=thread.latest_message %}
         {% endfor %}
       </ul>
       <a class="column-align" href="{% url 'thread_list' %}">
diff --git a/src/templates/search/preview-search.html b/src/templates/search/preview-search.html
deleted file mode 100644
index 5e5d51b..0000000
--- a/src/templates/search/preview-search.html
+++ /dev/null
@@ -1,53 +0,0 @@
-{% load i18n %}
-{% load highlight %}
-
-<li class="preview-message">
-<span class="glyphicon glyphicon-{{ result.icon_name }}" title="{{ result.type }}"></span>
-
-{% if result.tag %}
-<a href="{% firstof result.mailinglist_url result.url %}">
-  <span class="label label-primary">{{ result.tag }}</span>
-</a>
-{% endif %}
-
-{% if result.title %}
-  <a href="{{ result.url }}" {% if result.description %}title="{{ result.description|escape|truncatechars:200 }}"{% endif %}>
-    <span class="subject">
-      <!-- a striptags filter was raising an error here because using with highlight -->
-      {% if query %}
-        {% highlight result.title with query max_length "1000" %}
-      {% else %}
-        {{ result.title }}
-      {% endif %}
-    </span>
-  </a>
-{% endif %}
-
-{% if result.description %}
-      <!-- a striptags filter was raising an error here because using with highlight -->
-  <span class="quiet">- {% if query %}{% highlight result.description with query max_length "150" %}{% else %}{{ result.description }}{% endif %}</span>
-{% endif %}
-
-{% if result.author or result.modified %}
-  <div class="quiet">
-    {% if result.author %}
-      <span class="pull-left">{% trans "by" %}
-        {% if result.author and result.author_url %}
-          <a href="{{ result.author_url }}">
-            {% if query %}
-              {% highlight result.author with query %}
-            {% else %}
-              {{ result.author }}
-            {% endif %}
-          </a>
-        {% else %}
-          <span>{{ result.author }}</span>
-        {% endif %}
-      </span>
-    {% endif %}
-    {% if result.modified %}
-    <span class="pull-right">{{ result.modified|timesince }} {% trans "ago" %}</span>
-    {% endif %}
-  </div>
-{% endif %}
-</li>
diff --git a/src/templates/search/search.html b/src/templates/search/search.html
index 7b7b9a1..ac2228c 100644
--- a/src/templates/search/search.html
+++ b/src/templates/search/search.html
@@ -214,7 +214,7 @@
     <div class="col-lg-10">
       <ul class="list-unstyled">
       {% for result in page.object_list  %}
-        {% include "search/preview-search.html" %}
+        {% include "message-preview.html" %}
       {% empty %}
         <li class="text-center">
           {% trans "No results for your search." %}
--
libgit2 0.21.2