moving modified_by to base indexes

Luan
1 parent e67bc4d4
Showing 3 changed files with 23 additions and 27 deletions Show diff stats
src/proxy/search_indexes.py
src/search/base_indexes.py
src/super_archives/search_indexes.py
@@ -78,8 +78,6 @@ 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,
@@ -92,12 +90,6 @@ class WikiIndex(BaseIndex, indexes.Indexable):
     def prepare_description(self, obj):
         return u'{}\n{}'.format(obj.wiki_text, obj.collaborators)
-    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'
@@ -112,8 +104,6 @@ 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,
@@ -129,12 +119,6 @@ class TicketIndex(BaseIndex, indexes.Indexable):
             obj.reporter, obj.keywords, obj.collaborators
         )
-    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'
@@ -19,6 +19,8 @@ class BaseIndex(indexes.SearchIndex):
     icon_name = indexes.CharField(indexed=False)
     fullname_and_username = indexes.CharField(null=True, stored=False)
     hits = indexes.IntegerField(model_attr='hits')
+    modified_by = indexes.CharField(null=True)
+    modified_by_url = indexes.CharField(null=True)
     def get_updated_field(self):
         return 'modified'
@@ -40,15 +42,6 @@ class BaseIndex(indexes.SearchIndex):
             return author.username
         return obj.author
-    def prepare_fullname_and_username(self, obj):
-        author = obj.get_author()
-        if not author:
-            return obj.author
-        return u'{}\n{}'.format(
-            author.get_full_name(),
-            author.username,
-        )
-
     def prepare_author_url(self, obj):
         author = obj.get_author()
         if author:
@@ -66,3 +59,24 @@ class BaseIndex(indexes.SearchIndex):
             if author:
                 return author.get_full_name()
             return obj.author
+
+    def prepare_fullname_and_username(self, obj):
+        author = obj.get_author()
+        if not author:
+            return obj.author
+        return u'{}\n{}'.format(
+            author.get_full_name(),
+            author.username,
+        )
+
+    def prepare_modified_by(self, obj):
+        if hasattr(obj, 'modified_by'):
+            return obj.modified_by
+        return None
+
+    def prepare_modified_by_url(self, obj):
+        if hasattr(obj, 'modified_by'):
+            modified_by = obj.get_modified_by()
+            if modified_by:
+                return modified_by.get_absolute_url()
+        return None
@@ -19,8 +19,6 @@ 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(
	@@ -19,6 +19,8 @@ class BaseIndex(indexes.SearchIndex):		@@ -19,6 +19,8 @@ class BaseIndex(indexes.SearchIndex):
19	icon_name = indexes.CharField(indexed=False)	19	icon_name = indexes.CharField(indexed=False)
20	fullname_and_username = indexes.CharField(null=True, stored=False)	20	fullname_and_username = indexes.CharField(null=True, stored=False)
21	hits = indexes.IntegerField(model_attr='hits')	21	hits = indexes.IntegerField(model_attr='hits')
		22	+ modified_by = indexes.CharField(null=True)
		23	+ modified_by_url = indexes.CharField(null=True)
22		24
23	def get_updated_field(self):	25	def get_updated_field(self):
24	return 'modified'	26	return 'modified'
	@@ -40,15 +42,6 @@ class BaseIndex(indexes.SearchIndex):		@@ -40,15 +42,6 @@ class BaseIndex(indexes.SearchIndex):
40	return author.username	42	return author.username
41	return obj.author	43	return obj.author
42		44
43	- def prepare_fullname_and_username(self, obj):
44	- author = obj.get_author()
45	- if not author:
46	- return obj.author
47	- return u'{}\n{}'.format(
48	- author.get_full_name(),
49	- author.username,
50	- )
51	-
52	def prepare_author_url(self, obj):	45	def prepare_author_url(self, obj):
53	author = obj.get_author()	46	author = obj.get_author()
54	if author:	47	if author:
	@@ -66,3 +59,24 @@ class BaseIndex(indexes.SearchIndex):		@@ -66,3 +59,24 @@ class BaseIndex(indexes.SearchIndex):
66	if author:	59	if author:
67	return author.get_full_name()	60	return author.get_full_name()
68	return obj.author	61	return obj.author
		62	+
		63	+ def prepare_fullname_and_username(self, obj):
		64	+ author = obj.get_author()
		65	+ if not author:
		66	+ return obj.author
		67	+ return u'{}\n{}'.format(
		68	+ author.get_full_name(),
		69	+ author.username,
		70	+ )
		71	+
		72	+ def prepare_modified_by(self, obj):
		73	+ if hasattr(obj, 'modified_by'):
		74	+ return obj.modified_by
		75	+ return None
		76	+
		77	+ def prepare_modified_by_url(self, obj):
		78	+ if hasattr(obj, 'modified_by'):
		79	+ modified_by = obj.get_modified_by()
		80	+ if modified_by:
		81	+ return modified_by.get_absolute_url()
		82	+ return None