fixing profile linking to wrong users - closes #127

Luan
1 parent 7f2a2345
Showing 2 changed files with 27 additions and 9 deletions Show diff stats
src/super_archives/models.py
src/super_archives/templates/message-preview.html
@@ -334,6 +334,16 @@ class Message(models.Model):
             return self.from_address.user.get_absolute_url()
         return None
+    # An alias for author
+    @property
+    def modified_by(self):
+        return self.author
+
+    # An alias for author_url
+    @property
+    def modified_by_url(self):
+        return self.author_url
+
     @property
     def fullname(self):
         return self.from_address.get_full_name()
@@ -40,20 +40,28 @@
   <div class="quiet">
     {% if result.fullname or result.modified_by %}
       <span class="pull-left">{% trans "by" %}
-        {% if result.fullname and result.author_url or result.modified_by and result.modified_by_url %}
-          <a href="{% firstof result.modified_by_url result.author_url %}">
+        {% if result.modified_by and result.modified_by_url %}
+          <a href="{{ result.author_url }}">
             {% if query %}
-              {% if result.modified_by %}
-                {% highlight result.modified_by with query %}
-              {% else %}
-                {% highlight result.fullname with query %}
-              {% endif %}
+              {% highlight result.fullname with query %}
             {% else %}
-              {% firstof result.modified_by result.fullname %}
+              {{ result.fullname }}
+            {% endif %}
+          </a>
+        {% elif result.fullname and result.author_url %}
+          <a href="{{ result.modified_by_url }}">
+            {% if query %}
+              {% highlight result.modified_by with query %}
+            {% else %}
+              {{ result.modified_by }}
             {% endif %}
           </a>
         {% else %}
-          <span>{{ result.fullname }}</span>
+          {% if result.modified_by %}
+            <span>{{ result.modified_by }}</span>
+          {% else %}
+            <span>{{ result.fullname }}</span>
+          {% endif %}
         {% endif %}
       </span>
     {% else %}
	@@ -334,6 +334,16 @@ class Message(models.Model):		@@ -334,6 +334,16 @@ class Message(models.Model):
334	return self.from_address.user.get_absolute_url()	334	return self.from_address.user.get_absolute_url()
335	return None	335	return None
336		336
		337	+ # An alias for author
		338	+ @property
		339	+ def modified_by(self):
		340	+ return self.author
		341	+
		342	+ # An alias for author_url
		343	+ @property
		344	+ def modified_by_url(self):
		345	+ return self.author_url
		346	+
337	@property	347	@property
338	def fullname(self):	348	def fullname(self):
339	return self.from_address.get_full_name()	349	return self.from_address.get_full_name()