Adding modified_by to display it on message-preview

Luan
1 parent 8b151b24
Showing 7 changed files with 195 additions and 15 deletions Show diff stats
src/proxy/migrations/0005_adding_modified_by.py
src/proxy/models.py
src/proxy/search_indexes.py
src/search/base_indexes.py
src/super_archives/models.py
src/super_archives/search_indexes.py
src/super_archives/templates/message-preview.html
@@ -0,0 +1,125 @@
+# -*- coding: utf-8 -*-
+import datetime
+from django.db import connections
+from south.db import db
+from south.v2 import DataMigration
+from django.db import models
+
+class Migration(DataMigration):
+
+    def forwards(self, orm):
+        # Selecting trac database
+        connection = connections['trac']
+
+        cursor = connection.cursor()
+        cursor.execute('''
+            CREATE OR REPLACE VIEW wiki_view AS SELECT
+                wiki.name AS name,
+                (SELECT wiki2.text FROM wiki AS wiki2 WHERE wiki2.name = wiki.name
+                 AND wiki2.version = MAX(wiki.version)) AS wiki_text,
+                (SELECT wiki3.author FROM wiki AS wiki3 WHERE wiki3.name = wiki.name
+                 AND wiki3.version = 1) AS author,
+                string_agg(DISTINCT wiki.author, ', ') AS collaborators,
+                TIMESTAMP WITH TIME ZONE 'epoch' + (MIN(wiki.time)/1000000) * INTERVAL '1s' AS created,
+                TIMESTAMP WITH TIME ZONE 'epoch' + (MAX(wiki.time)/1000000) * INTERVAL '1s' AS modified,
+                (SELECT wiki4.author FROM wiki AS wiki4 WHERE wiki4.name = wiki.name
+                 AND wiki4.version = MAX(wiki.version)) AS modified_by
+            FROM wiki
+            GROUP BY wiki.name;
+
+            CREATE OR REPLACE VIEW ticket_view AS SELECT
+                ticket.id AS id,
+                ticket.summary as summary,
+                ticket.description as description,
+                ticket.milestone as milestone,
+                ticket.priority as priority,
+                ticket.component as component,
+                ticket.version as version,
+                ticket.severity as severity,
+                ticket.reporter as reporter,
+                ticket.reporter as author,
+                ticket.status as status,
+                ticket.keywords as keywords,
+                (SELECT
+                    string_agg(DISTINCT ticket_change.author, ', ')
+                    FROM ticket_change WHERE ticket_change.ticket = ticket.id
+                    GROUP BY ticket_change.ticket) as collaborators,
+                TIMESTAMP WITH TIME ZONE 'epoch' + (time/1000000)* INTERVAL '1s' AS created,
+                TIMESTAMP WITH TIME ZONE 'epoch' + (changetime/1000000) * INTERVAL '1s' AS modified,
+                (SELECT
+                    ticket_change.author
+                 FROM ticket_change
+                 WHERE ticket_change.ticket = ticket.id
+                    AND ticket_change.time = ticket.changetime
+                 LIMIT 1
+                ) AS modified_by
+            FROM ticket;
+	    ''')
+
+
+    def backwards(self, orm):
+        # Selecting trac database
+        connection = connections['trac']
+
+        cursor = connection.cursor()
+        cursor.execute('''
+            ALTER VIEW wiki_view ALTER COLUMN modified_by DROP DEFAULT;
+            ALTER VIEW ticket_view ALTER COLUMN modified_by DROP DEFAULT;
+	    ''')
+
+
+    models = {
+        u'proxy.attachment': {
+            'Meta': {'object_name': 'Attachment', 'db_table': "'attachment_view'", 'managed': 'False'},
+            'attach_id': ('django.db.models.fields.TextField', [], {}),
+            'author': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'filename': ('django.db.models.fields.TextField', [], {}),
+            'mimetype': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'size': ('django.db.models.fields.IntegerField', [], {'blank': 'True'}),
+            'url': ('django.db.models.fields.TextField', [], {'primary_key': 'True'}),
+            'used_by': ('django.db.models.fields.TextField', [], {})
+        },
+        u'proxy.revision': {
+            'Meta': {'object_name': 'Revision', 'db_table': "'revision_view'", 'managed': 'False'},
+            'author': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'key': ('django.db.models.fields.TextField', [], {'primary_key': 'True'}),
+            'message': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'repository_name': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'rev': ('django.db.models.fields.TextField', [], {'blank': 'True'})
+        },
+        u'proxy.ticket': {
+            'Meta': {'object_name': 'Ticket', 'db_table': "'ticket_view'", 'managed': 'False'},
+            'author': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'collaborators': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'component': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'id': ('django.db.models.fields.IntegerField', [], {'primary_key': 'True'}),
+            'keywords': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'milestone': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'modified': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'modified_by': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'priority': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'reporter': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'severity': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'status': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'summary': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'version': ('django.db.models.fields.TextField', [], {'blank': 'True'})
+        },
+        u'proxy.wiki': {
+            'Meta': {'object_name': 'Wiki', 'db_table': "'wiki_view'", 'managed': 'False'},
+            'author': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'collaborators': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'modified': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'modified_by': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'name': ('django.db.models.fields.TextField', [], {'primary_key': 'True'}),
+            'wiki_text': ('django.db.models.fields.TextField', [], {'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['proxy']
+    symmetrical = True
@@ -81,6 +81,7 @@ class Ticket(models.Model, HitCounterModelMixin):
     collaborators = models.TextField(blank=True)
     created = models.DateTimeField(blank=True, null=True)
     modified = models.DateTimeField(blank=True, null=True)
+    modified_by = models.TextField(blank=True)
  
     class Meta:
         managed = False
@@ -95,6 +96,12 @@ class Ticket(models.Model, HitCounterModelMixin):
         except User.DoesNotExist:
             return None
  
+    def get_modified_by(self):
+        try:
+            return User.objects.get(username=self.modified_by)
+        except User.DoesNotExist:
+            return None
+
  
 class Wiki(models.Model, HitCounterModelMixin):
     name = models.TextField(primary_key=True)
@@ -103,6 +110,7 @@ class Wiki(models.Model, HitCounterModelMixin):
     collaborators = models.TextField(blank=True)
     created = models.DateTimeField(blank=True, null=True)
     modified = models.DateTimeField(blank=True, null=True)
+    modified_by = models.TextField(blank=True)
  
     class Meta:
         managed = False
@@ -116,3 +124,9 @@ class Wiki(models.Model, HitCounterModelMixin):
             return User.objects.get(username=self.author)
         except User.DoesNotExist:
             return None
+
+    def get_modified_by(self):
+        try:
+            return User.objects.get(username=self.modified_by)
+        except User.DoesNotExist:
+            return None
@@ -78,6 +78,8 @@ class AttachmentIndex(BaseIndex, indexes.Indexable):
  
 class WikiIndex(BaseIndex, indexes.Indexable):
     title = indexes.CharField(model_attr='name')
+    modified_by = indexes.CharField(model_attr='modified_by', null=True)
+    modified_by_url = indexes.CharField(null=True)
     collaborators = indexes.CharField(
         model_attr='collaborators',
         null=True,
@@ -90,6 +92,15 @@ class WikiIndex(BaseIndex, indexes.Indexable):
     def prepare_description(self, obj):
         return u'{}\n{}'.format(obj.wiki_text, obj.collaborators)
  
+    def prepare_modified_by(self, obj):
+        return obj.modified_by
+
+    def prepare_modified_by_url(self, obj):
+        modified_by = obj.get_modified_by()
+        if modified_by:
+            return modified_by.get_absolute_url()
+        return None
+
     def prepare_icon_name(self, obj):
         return u'book'
  
@@ -104,6 +115,8 @@ class TicketIndex(BaseIndex, indexes.Indexable):
     severity = indexes.CharField(model_attr='severity', null=True)
     reporter = indexes.CharField(model_attr='reporter', null=True)
     keywords = indexes.CharField(model_attr='keywords', null=True)
+    modified_by = indexes.CharField(model_attr='modified_by', null=True)
+    modified_by_url = indexes.CharField(null=True)
     collaborators = indexes.CharField(
         model_attr='collaborators',
         null=True,
@@ -119,6 +132,15 @@ class TicketIndex(BaseIndex, indexes.Indexable):
             obj.reporter, obj.keywords, obj.collaborators
         )
  
+    def prepare_modified_by(self, obj):
+        return obj.modified_by
+
+    def prepare_modified_by_url(self, obj):
+        modified_by = obj.get_modified_by()
+        if modified_by:
+            return modified_by.get_absolute_url()
+        return None
+
     def prepare_icon_name(self, obj):
         return u'tag'
  
@@ -56,7 +56,13 @@ class BaseIndex(indexes.SearchIndex):
         return None
  
     def prepare_fullname(self, obj):
-        author = obj.get_author()
-        if author:
-            return author.get_full_name()
-        return obj.author
+        if hasattr(obj, 'modified_by':
+            modified_by = obj.get_modified_by()
+            if modified_by:
+                return modified_by.get_full_name()
+            return None
+        else:
+            author = obj.get_author()
+            if author:
+                return author.get_full_name()
+            return obj.author
@@ -332,12 +332,10 @@ class Message(models.Model):
         return None
  
     @property
-    def fullname(self):
-        return self.from_address.get_full_name()
-
-    @property
     def author_url(self):
-        return self.from_address.user.get_absolute_url()
+        if self.from_address.user_id:
+            return self.from_address.user.get_absolute_url()
+        return None
  
     @property
     def icon_name(self):
@@ -19,6 +19,8 @@ class ThreadIndex(BaseIndex, indexes.Indexable):
     modified = indexes.DateTimeField(
         model_attr='latest_message__modified'
     )
+    modified_by = indexes.CharField(null=True)
+    modified_by_url = indexes.CharField(null=True)
     tag = indexes.CharField(model_attr='mailinglist__name')
     collaborators = indexes.CharField(use_template=True, stored=False)
     mailinglist_url = indexes.CharField(
@@ -58,9 +60,18 @@ class ThreadIndex(BaseIndex, indexes.Indexable):
             return first_message.from_address.user.get_absolute_url()
         return None
  
+    def prepare_modified_by(self, obj):
+        return obj.latest_message.author
+
+    def prepare_modified_by_url(self, obj):
+        return obj.latest_message.author_url
+
     def prepare_created(self, obj):
         return obj.message_set.first().received_time
  
+    def prepare_fullname(self, obj):
+        return obj.latest_message.from_address.get_full_name()
+
     def prepare_icon_name(self, obj):
         return u'envelope'
  
@@ -36,16 +36,20 @@
   </span>
 {% endif %}
  
-{% if result.fullname or result.modified %}
+{% if result.fullname or result.modified or result.modified_by %}
   <div class="quiet">
-    {% if result.fullname %}
+    {% if result.fullname or result.modified_by %}
       <span class="pull-left">{% trans "by" %}
-        {% if result.fullname and result.author_url %}
-          <a href="{{ result.author_url }}">
+        {% 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 query %}
-              {% highlight result.fullname with query %}
+              {% if result.modified_by %}
+                {% highlight result.modified_by with query %}
+              {% else %}
+                {% highlight result.fullname with query %}
+              {% endif %}
             {% else %}
-              {{ result.fullname }}
+              {% firstof result.modified_by result.fullname %}
             {% endif %}
           </a>
         {% else %}
...	...	@@ -0,0 +1,125 @@
	1	+# -- coding: utf-8 --
	2	+import datetime
	3	+from django.db import connections
	4	+from south.db import db
	5	+from south.v2 import DataMigration
	6	+from django.db import models
	7	+
	8	+class Migration(DataMigration):
	9	+
	10	+ def forwards(self, orm):
	11	+ # Selecting trac database
	12	+ connection = connections['trac']
	13	+
	14	+ cursor = connection.cursor()
	15	+ cursor.execute('''
	16	+ CREATE OR REPLACE VIEW wiki_view AS SELECT
	17	+ wiki.name AS name,
	18	+ (SELECT wiki2.text FROM wiki AS wiki2 WHERE wiki2.name = wiki.name
	19	+ AND wiki2.version = MAX(wiki.version)) AS wiki_text,
	20	+ (SELECT wiki3.author FROM wiki AS wiki3 WHERE wiki3.name = wiki.name
	21	+ AND wiki3.version = 1) AS author,
	22	+ string_agg(DISTINCT wiki.author, ', ') AS collaborators,
	23	+ TIMESTAMP WITH TIME ZONE 'epoch' + (MIN(wiki.time)/1000000) * INTERVAL '1s' AS created,
	24	+ TIMESTAMP WITH TIME ZONE 'epoch' + (MAX(wiki.time)/1000000) * INTERVAL '1s' AS modified,
	25	+ (SELECT wiki4.author FROM wiki AS wiki4 WHERE wiki4.name = wiki.name
	26	+ AND wiki4.version = MAX(wiki.version)) AS modified_by
	27	+ FROM wiki
	28	+ GROUP BY wiki.name;
	29	+
	30	+ CREATE OR REPLACE VIEW ticket_view AS SELECT
	31	+ ticket.id AS id,
	32	+ ticket.summary as summary,
	33	+ ticket.description as description,
	34	+ ticket.milestone as milestone,
	35	+ ticket.priority as priority,
	36	+ ticket.component as component,
	37	+ ticket.version as version,
	38	+ ticket.severity as severity,
	39	+ ticket.reporter as reporter,
	40	+ ticket.reporter as author,
	41	+ ticket.status as status,
	42	+ ticket.keywords as keywords,
	43	+ (SELECT
	44	+ string_agg(DISTINCT ticket_change.author, ', ')
	45	+ FROM ticket_change WHERE ticket_change.ticket = ticket.id
	46	+ GROUP BY ticket_change.ticket) as collaborators,
	47	+ TIMESTAMP WITH TIME ZONE 'epoch' + (time/1000000)* INTERVAL '1s' AS created,
	48	+ TIMESTAMP WITH TIME ZONE 'epoch' + (changetime/1000000) * INTERVAL '1s' AS modified,
	49	+ (SELECT
	50	+ ticket_change.author
	51	+ FROM ticket_change
	52	+ WHERE ticket_change.ticket = ticket.id
	53	+ AND ticket_change.time = ticket.changetime
	54	+ LIMIT 1
	55	+ ) AS modified_by
	56	+ FROM ticket;
	57	+ ''')
	58	+
	59	+
	60	+ def backwards(self, orm):
	61	+ # Selecting trac database
	62	+ connection = connections['trac']
	63	+
	64	+ cursor = connection.cursor()
	65	+ cursor.execute('''
	66	+ ALTER VIEW wiki_view ALTER COLUMN modified_by DROP DEFAULT;
	67	+ ALTER VIEW ticket_view ALTER COLUMN modified_by DROP DEFAULT;
	68	+ ''')
	69	+
	70	+
	71	+ models = {
	72	+ u'proxy.attachment': {
	73	+ 'Meta': {'object_name': 'Attachment', 'db_table': "'attachment_view'", 'managed': 'False'},
	74	+ 'attach_id': ('django.db.models.fields.TextField', [], {}),
	75	+ 'author': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
	76	+ 'created': ('django.db.models.fields.DateTimeField', [], {'blank': 'True'}),
	77	+ 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
	78	+ 'filename': ('django.db.models.fields.TextField', [], {}),
	79	+ 'mimetype': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
	80	+ 'size': ('django.db.models.fields.IntegerField', [], {'blank': 'True'}),
	81	+ 'url': ('django.db.models.fields.TextField', [], {'primary_key': 'True'}),
	82	+ 'used_by': ('django.db.models.fields.TextField', [], {})
	83	+ },
	84	+ u'proxy.revision': {
	85	+ 'Meta': {'object_name': 'Revision', 'db_table': "'revision_view'", 'managed': 'False'},
	86	+ 'author': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
	87	+ 'created': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
	88	+ 'key': ('django.db.models.fields.TextField', [], {'primary_key': 'True'}),
	89	+ 'message': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
	90	+ 'repository_name': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
	91	+ 'rev': ('django.db.models.fields.TextField', [], {'blank': 'True'})
	92	+ },
	93	+ u'proxy.ticket': {
	94	+ 'Meta': {'object_name': 'Ticket', 'db_table': "'ticket_view'", 'managed': 'False'},
	95	+ 'author': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
	96	+ 'collaborators': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
	97	+ 'component': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
	98	+ 'created': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
	99	+ 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
	100	+ 'id': ('django.db.models.fields.IntegerField', [], {'primary_key': 'True'}),
	101	+ 'keywords': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
	102	+ 'milestone': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
	103	+ 'modified': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
	104	+ 'modified_by': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
	105	+ 'priority': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
	106	+ 'reporter': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
	107	+ 'severity': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
	108	+ 'status': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
	109	+ 'summary': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
	110	+ 'version': ('django.db.models.fields.TextField', [], {'blank': 'True'})
	111	+ },
	112	+ u'proxy.wiki': {
	113	+ 'Meta': {'object_name': 'Wiki', 'db_table': "'wiki_view'", 'managed': 'False'},
	114	+ 'author': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
	115	+ 'collaborators': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
	116	+ 'created': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
	117	+ 'modified': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
	118	+ 'modified_by': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
	119	+ 'name': ('django.db.models.fields.TextField', [], {'primary_key': 'True'}),
	120	+ 'wiki_text': ('django.db.models.fields.TextField', [], {'blank': 'True'})
	121	+ }
	122	+ }
	123	+
	124	+ complete_apps = ['proxy']
	125	+ symmetrical = True
...	...
...	...	@@ -81,6 +81,7 @@ class Ticket(models.Model, HitCounterModelMixin):
81	81	collaborators = models.TextField(blank=True)
82	82	created = models.DateTimeField(blank=True, null=True)
83	83	modified = models.DateTimeField(blank=True, null=True)
	84	+ modified_by = models.TextField(blank=True)
84	85
85	86	class Meta:
86	87	managed = False
...	...	@@ -95,6 +96,12 @@ class Ticket(models.Model, HitCounterModelMixin):
95	96	except User.DoesNotExist:
96	97	return None
97	98
	99	+ def get_modified_by(self):
	100	+ try:
	101	+ return User.objects.get(username=self.modified_by)
	102	+ except User.DoesNotExist:
	103	+ return None
	104	+
98	105
99	106	class Wiki(models.Model, HitCounterModelMixin):
100	107	name = models.TextField(primary_key=True)
...	...	@@ -103,6 +110,7 @@ class Wiki(models.Model, HitCounterModelMixin):
103	110	collaborators = models.TextField(blank=True)
104	111	created = models.DateTimeField(blank=True, null=True)
105	112	modified = models.DateTimeField(blank=True, null=True)
	113	+ modified_by = models.TextField(blank=True)
106	114
107	115	class Meta:
108	116	managed = False
...	...	@@ -116,3 +124,9 @@ class Wiki(models.Model, HitCounterModelMixin):
116	124	return User.objects.get(username=self.author)
117	125	except User.DoesNotExist:
118	126	return None
	127	+
	128	+ def get_modified_by(self):
	129	+ try:
	130	+ return User.objects.get(username=self.modified_by)
	131	+ except User.DoesNotExist:
	132	+ return None
...	...
...	...	@@ -78,6 +78,8 @@ class AttachmentIndex(BaseIndex, indexes.Indexable):
78	78
79	79	class WikiIndex(BaseIndex, indexes.Indexable):
80	80	title = indexes.CharField(model_attr='name')
	81	+ modified_by = indexes.CharField(model_attr='modified_by', null=True)
	82	+ modified_by_url = indexes.CharField(null=True)
81	83	collaborators = indexes.CharField(
82	84	model_attr='collaborators',
83	85	null=True,
...	...	@@ -90,6 +92,15 @@ class WikiIndex(BaseIndex, indexes.Indexable):
90	92	def prepare_description(self, obj):
91	93	return u'{}\n{}'.format(obj.wiki_text, obj.collaborators)
92	94
	95	+ def prepare_modified_by(self, obj):
	96	+ return obj.modified_by
	97	+
	98	+ def prepare_modified_by_url(self, obj):
	99	+ modified_by = obj.get_modified_by()
	100	+ if modified_by:
	101	+ return modified_by.get_absolute_url()
	102	+ return None
	103	+
93	104	def prepare_icon_name(self, obj):
94	105	return u'book'
95	106
...	...	@@ -104,6 +115,8 @@ class TicketIndex(BaseIndex, indexes.Indexable):
104	115	severity = indexes.CharField(model_attr='severity', null=True)
105	116	reporter = indexes.CharField(model_attr='reporter', null=True)
106	117	keywords = indexes.CharField(model_attr='keywords', null=True)
	118	+ modified_by = indexes.CharField(model_attr='modified_by', null=True)
	119	+ modified_by_url = indexes.CharField(null=True)
107	120	collaborators = indexes.CharField(
108	121	model_attr='collaborators',
109	122	null=True,
...	...	@@ -119,6 +132,15 @@ class TicketIndex(BaseIndex, indexes.Indexable):
119	132	obj.reporter, obj.keywords, obj.collaborators
120	133	)
121	134
	135	+ def prepare_modified_by(self, obj):
	136	+ return obj.modified_by
	137	+
	138	+ def prepare_modified_by_url(self, obj):
	139	+ modified_by = obj.get_modified_by()
	140	+ if modified_by:
	141	+ return modified_by.get_absolute_url()
	142	+ return None
	143	+
122	144	def prepare_icon_name(self, obj):
123	145	return u'tag'
124	146
...	...
...	...	@@ -56,7 +56,13 @@ class BaseIndex(indexes.SearchIndex):
56	56	return None
57	57
58	58	def prepare_fullname(self, obj):
59		- author = obj.get_author()
60		- if author:
61		- return author.get_full_name()
62		- return obj.author
	59	+ if hasattr(obj, 'modified_by':
	60	+ modified_by = obj.get_modified_by()
	61	+ if modified_by:
	62	+ return modified_by.get_full_name()
	63	+ return None
	64	+ else:
	65	+ author = obj.get_author()
	66	+ if author:
	67	+ return author.get_full_name()
	68	+ return obj.author
...	...
...	...	@@ -332,12 +332,10 @@ class Message(models.Model):
332	332	return None
333	333
334	334	@property
335		- def fullname(self):
336		- return self.from_address.get_full_name()
337		-
338		- @property
339	335	def author_url(self):
340		- return self.from_address.user.get_absolute_url()
	336	+ if self.from_address.user_id:
	337	+ return self.from_address.user.get_absolute_url()
	338	+ return None
341	339
342	340	@property
343	341	def icon_name(self):
...	...
...	...	@@ -19,6 +19,8 @@ class ThreadIndex(BaseIndex, indexes.Indexable):
19	19	modified = indexes.DateTimeField(
20	20	model_attr='latest_message__modified'
21	21	)
	22	+ modified_by = indexes.CharField(null=True)
	23	+ modified_by_url = indexes.CharField(null=True)
22	24	tag = indexes.CharField(model_attr='mailinglist__name')
23	25	collaborators = indexes.CharField(use_template=True, stored=False)
24	26	mailinglist_url = indexes.CharField(
...	...	@@ -58,9 +60,18 @@ class ThreadIndex(BaseIndex, indexes.Indexable):
58	60	return first_message.from_address.user.get_absolute_url()
59	61	return None
60	62
	63	+ def prepare_modified_by(self, obj):
	64	+ return obj.latest_message.author
	65	+
	66	+ def prepare_modified_by_url(self, obj):
	67	+ return obj.latest_message.author_url
	68	+
61	69	def prepare_created(self, obj):
62	70	return obj.message_set.first().received_time
63	71
	72	+ def prepare_fullname(self, obj):
	73	+ return obj.latest_message.from_address.get_full_name()
	74	+
64	75	def prepare_icon_name(self, obj):
65	76	return u'envelope'
66	77
...	...
...	...	@@ -36,16 +36,20 @@
36	36	</span>
37	37	{% endif %}
38	38
39		-{% if result.fullname or result.modified %}
	39	+{% if result.fullname or result.modified or result.modified_by %}
40	40	<div class="quiet">
41		- {% if result.fullname %}
	41	+ {% if result.fullname or result.modified_by %}
42	42	<span class="pull-left">{% trans "by" %}
43		- {% if result.fullname and result.author_url %}
44		- <a href="{{ result.author_url }}">
	43	+ {% if result.fullname and result.author_url or result.modified_by and result.modified_by_url %}
	44	+ <a href="{% firstof result.modified_by_url result.author_url %}">
45	45	{% if query %}
46		- {% highlight result.fullname with query %}
	46	+ {% if result.modified_by %}
	47	+ {% highlight result.modified_by with query %}
	48	+ {% else %}
	49	+ {% highlight result.fullname with query %}
	50	+ {% endif %}
47	51	{% else %}
48		- {{ result.fullname }}
	52	+ {% firstof result.modified_by result.fullname %}
49	53	{% endif %}
50	54	</a>
51	55	{% else %}
...	...