Merge branch 'master' of github.com:TracyWebTech/colab

Sergio Oliveira
2 parents 0b119ef5 f40f5197
Showing 5 changed files with 52 additions and 35 deletions Show diff stats
Vagrantfile
src/proxy/search_indexes.py
src/search/forms.py
src/super_archives/search_indexes.py
src/super_archives/templates/search/indexes/super_archives/thread_description.txt
@@ -23,6 +23,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.network :forwarded_port, guest: 7000, host: 8000
   config.vm.network :forwarded_port, guest: 5280, host: 5280
   config.vm.network :forwarded_port, guest: 8080, host: 8081
+  config.vm.network :forwarded_port, guest: 8983, host: 8983
   # Create a private network, which allows host-only access to the machine
   # using a specific IP.
@@ -10,20 +10,24 @@ from .models import Ticket, Wiki, Revision
 class WikiIndex(indexes.SearchIndex, indexes.Indexable):
     # common fields
-    text = indexes.CharField(document=True, use_template=True)
-    url = indexes.CharField(model_attr='get_absolute_url')
+    text = indexes.CharField(document=True, use_template=True, stored=False)
+    url = indexes.CharField(model_attr='get_absolute_url', indexed=False)
     title = indexes.CharField(model_attr='name')
     description = indexes.CharField(null=True)
     author = indexes.CharField(null=True)
-    author_url = indexes.CharField(null=True)
+    author_url = indexes.CharField(null=True, indexed=False)
     created = indexes.DateTimeField(model_attr='created', null=True)
     modified = indexes.DateTimeField(model_attr='modified', null=True)
     type = indexes.CharField()
-    icon_name = indexes.CharField()
-    author_username = indexes.CharField(null=True)
+    icon_name = indexes.CharField(indexed=False)
+    author_and_username = indexes.CharField(null=True, stored=False)
     # trac extra fields
-    collaborators = indexes.CharField(model_attr='collaborators', null=True)
+    collaborators = indexes.CharField(
+        model_attr='collaborators',
+        null=True,
+        stored=False,
+    )
     def get_model(self):
         return Wiki
@@ -37,7 +41,7 @@ class WikiIndex(indexes.SearchIndex, indexes.Indexable):
             return author.get_full_name()
         return obj.author
-    def prepare_author_username(self, obj):
+    def prepare_author_and_username(self, obj):
         author = obj.get_author()
         if not author:
             return obj.author
@@ -64,18 +68,18 @@ class WikiIndex(indexes.SearchIndex, indexes.Indexable):
 class TicketIndex(indexes.SearchIndex, indexes.Indexable):
     # common fields
-    text = indexes.CharField(document=True, use_template=True)
-    url = indexes.CharField(model_attr='get_absolute_url')
+    text = indexes.CharField(document=True, use_template=True, stored=False)
+    url = indexes.CharField(model_attr='get_absolute_url', indexed=False)
     title = indexes.CharField()
     description = indexes.CharField(null=True)
     author = indexes.CharField(null=True)
-    author_url = indexes.CharField(null=True)
+    author_url = indexes.CharField(null=True, indexed=False)
     created = indexes.DateTimeField(model_attr='created', null=True)
     modified = indexes.DateTimeField(model_attr='modified', null=True)
     type = indexes.CharField()
-    icon_name = indexes.CharField()
+    icon_name = indexes.CharField(indexed=False)
     tag = indexes.CharField(model_attr='status', null=True)
-    author_username = indexes.CharField(null=True)
+    author_and_username = indexes.CharField(null=True, stored=False)
     # trac extra fields
     milestone = indexes.CharField(model_attr='milestone', null=True)
@@ -83,7 +87,11 @@ class TicketIndex(indexes.SearchIndex, 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)
-    collaborators = indexes.CharField(model_attr='collaborators', null=True)
+    collaborators = indexes.CharField(
+        model_attr='collaborators',
+        null=True,
+        stored=False,
+    )
     def get_model(self):
         return Ticket
@@ -97,7 +105,7 @@ class TicketIndex(indexes.SearchIndex, indexes.Indexable):
             return author.get_full_name()
         return obj.author
-    def prepare_author_username(self, obj):
+    def prepare_author_and_username(self, obj):
         author = obj.get_author()
         if not author:
             return obj.author
@@ -130,21 +138,23 @@ class TicketIndex(indexes.SearchIndex, indexes.Indexable):
 class RevisionIndex(indexes.SearchIndex, indexes.Indexable):
     # common fields
-    text = indexes.CharField(document=True, use_template=True)
-    url = indexes.CharField(model_attr='get_absolute_url')
+    text = indexes.CharField(document=True, use_template=True, stored=False)
+    url = indexes.CharField(model_attr='get_absolute_url', indexed=False)
     title = indexes.CharField()
     description = indexes.CharField(model_attr='message', null=True)
     author = indexes.CharField(null=True)
-    author_url = indexes.CharField(null=True)
+    author_url = indexes.CharField(null=True, indexed=False)
     created = indexes.DateTimeField(model_attr='created', null=True)
     modified = indexes.DateTimeField(model_attr='created', null=True)
     type = indexes.CharField()
-    icon_name = indexes.CharField()
-    author_username = indexes.CharField(null=True)
+    icon_name = indexes.CharField(indexed=False)
+    author_and_username = indexes.CharField(null=True, stored=False)
     # trac extra fields
-    repository_name = indexes.CharField(model_attr='repository_name')
-    revision = indexes.CharField(model_attr='rev')
+    repository_name = indexes.CharField(
+        model_attr='repository_name',
+        stored=False
+    )
     def get_model(self):
         return Revision
@@ -158,7 +168,7 @@ class RevisionIndex(indexes.SearchIndex, indexes.Indexable):
             return author.get_full_name()
         return obj.author
-    def prepare_author_username(self, obj):
+    def prepare_author_and_username(self, obj):
         author = obj.get_author()
         if not author:
             return obj.author
@@ -63,7 +63,7 @@ class ColabSearchForm(SearchForm):
         if self.cleaned_data['author']:
             sqs = sqs.filter(
-                author_username__contains=self.cleaned_data['author']
+                author_and_username__contains=self.cleaned_data['author']
             )
         if self.cleaned_data['milestone']:
@@ -7,25 +7,33 @@ from .models import Thread
 class ThreadIndex(indexes.SearchIndex, indexes.Indexable):
     # common fields
-    text = indexes.CharField(document=True, use_template=True)
-    url = indexes.CharField(model_attr='get_absolute_url', null=True)
+    text = indexes.CharField(document=True, use_template=True, stored=False)
+    url = indexes.CharField(
+        model_attr='get_absolute_url',
+        null=True,
+        indexed=False
+    )
     title = indexes.CharField(model_attr='latest_message__subject_clean')
     description = indexes.CharField(use_template=True)
-    latest_description = indexes.CharField(model_attr='latest_message__body')
+    latest_description = indexes.CharField(
+        model_attr='latest_message__body',
+        indexed=False,
+    )
     created = indexes.DateTimeField()
     modified = indexes.DateTimeField(
         model_attr='latest_message__received_time'
     )
     author = indexes.CharField(null=True)
-    author_url = indexes.CharField(null=True)
+    author_url = indexes.CharField(null=True, indexed=False)
     type = indexes.CharField()
-    icon_name = indexes.CharField()
+    icon_name = indexes.CharField(indexed=False)
     tag = indexes.CharField(model_attr='mailinglist__name')
-    collaborators = indexes.CharField(use_template=True)
+    collaborators = indexes.CharField(use_template=True, stored=False)
-    author_username = indexes.CharField(null=True)
+    author_and_username = indexes.CharField(null=True, stored=False)
     mailinglist_url = indexes.CharField(
-        model_attr='mailinglist__get_absolute_url'
+        model_attr='mailinglist__get_absolute_url',
+        indexed=False,
     )
     def get_model(self):
@@ -37,7 +45,7 @@ class ThreadIndex(indexes.SearchIndex, indexes.Indexable):
     def prepare_author(self, obj):
         return obj.message_set.first().from_address.get_full_name()
-    def prepare_author_username(self, obj):
+    def prepare_author_and_username(self, obj):
         from_address = obj.message_set.first().from_address
         if not from_address.user:
             return from_address.get_full_name()
 {% for message in object.message_set.iterator %}
-  {% if not spam %}
-    {{ message.body }}
-  {% endif %}
+  {{ message.body }}
 {% endfor %}
	@@ -23,6 +23,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do \|config\|		@@ -23,6 +23,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do \|config\|
23	config.vm.network :forwarded_port, guest: 7000, host: 8000	23	config.vm.network :forwarded_port, guest: 7000, host: 8000
24	config.vm.network :forwarded_port, guest: 5280, host: 5280	24	config.vm.network :forwarded_port, guest: 5280, host: 5280
25	config.vm.network :forwarded_port, guest: 8080, host: 8081	25	config.vm.network :forwarded_port, guest: 8080, host: 8081
		26	+ config.vm.network :forwarded_port, guest: 8983, host: 8983
26		27
27	# Create a private network, which allows host-only access to the machine	28	# Create a private network, which allows host-only access to the machine
28	# using a specific IP.	29	# using a specific IP.
	@@ -63,7 +63,7 @@ class ColabSearchForm(SearchForm):		@@ -63,7 +63,7 @@ class ColabSearchForm(SearchForm):
63		63
64	if self.cleaned_data['author']:	64	if self.cleaned_data['author']:
65	sqs = sqs.filter(	65	sqs = sqs.filter(
66	- author_username__contains=self.cleaned_data['author']	66	+ author_and_username__contains=self.cleaned_data['author']
67	)	67	)
68		68
69	if self.cleaned_data['milestone']:	69	if self.cleaned_data['milestone']:
1	{% for message in object.message_set.iterator %}	1	{% for message in object.message_set.iterator %}
2	- {% if not spam %}
3	- {{ message.body }}
4	- {% endif %}	2	+ {{ message.body }}
5	{% endfor %}	3	{% endfor %}