Added dynamic include for search_preview templates

Signed-off-by: Macartur Sousa <macartur.sc@gmail.com> Signed-off-by: Lucas Moura <lucas.moura28@gmail.com> Signed-off-by: Lucas Kanashiro <kanashiro.duarte@gmail.com>

Added dynamic include for search_preview templates
Signed-off-by: Macartur Sousa <macartur.sc@gmail.com> Signed-off-by: Lucas Moura <lucas.moura28@gmail.com> Signed-off-by: Lucas Kanashiro <kanashiro.duarte@gmail.com>
Macartur Sousa
1 parent 3cbe2597
Showing 6 changed files with 29 additions and 25 deletions Show diff stats
colab/accounts/templates/accounts/user_search_preview.html
colab/search/templates/message-preview.html
colab/search/templatetags/__init__.py
colab/search/templatetags/search_preview_templates.py
colab/super_archives/templates/message-preview.html
colab/super_archives/templates/superarchives/thread_search_preview.html
 {% load i18n tz highlight gravatar %}
  
-<div > {% gravatar user.email 50 %} {{ user.name  }} 
-Data joined: {{ user.date_joined }}
-Registred in: <a href='#'>link</a><br>
+<div >
+{% gravatar result.email 50 %} {{ result.name  }}
+Data joined: {{ result.date_joined }}<br>
+Registred in: <a href='#'>User</a><br>
 </div>
-
@@ -0,0 +1,4 @@
+{% load i18n tz highlight search_preview_templates %}
+
+{% get_search_preview_templates result  as template_target %}
+{% include template_target %}
@@ -0,0 +1,18 @@
+from django import template
+
+
+register = template.Library()
+
+@register.assignment_tag
+def get_search_preview_templates(model_indexed):
+    app_type = model_indexed.type
+    app_name = ""
+
+    if app_type in "user":
+        app_name = "accounts"
+    elif app_type in "thread":
+        app_name = "superarchives"
+    else:
+        app_name, app_type = app_type.split("_",1)
+
+    return "{}/{}_search_preview.html".format(app_name, app_type)
@@ -1,18 +0,0 @@
-{% load i18n tz highlight %}
-
-{%  if result.type in "user" %}
-  {% include "accounts/user_search_preview.html" with user=result %}
-{% endif %}
-
-{% if result.type in "thread" %}
-  {% include "superarchives/thread_search_preview.html" with thread=result %}
-{% endif%}
-
-{% if result.type in "noosfero_community"%}
-  {% include "noosfero/community_search_preview.html" with community=result %}
-{% endif%}
-
-{% if result.type in "noosfero_article"%}
-  {% include "noosfero/article_search_preview.html" with article=result %}
-{% endif%}
-
 {% load i18n tz highlight %}
  
 <div>
-<h3> {{ thread.title }}</h3>
-{{ thread.latest_description }}
+<h3> {{ result.title }}</h3>
+{{ result.latest_description|truncatewords:"85" }}
 <br>
-{{ thread.modified_by }} - {{ thread.modified |date:"d \d\e F \d\e Y" }}
+{{ result.modified_by }} - {{ result.modified |date:"d \d\e F \d\e Y" }}
 <br>
 </div>
1	1	{% load i18n tz highlight gravatar %}
2	2
3		-<div > {% gravatar user.email 50 %} {{ user.name }}
4		-Data joined: {{ user.date_joined }}
5		-Registred in: <a href='#'>link</a><br>
	3	+<div >
	4	+{% gravatar result.email 50 %} {{ result.name }}
	5	+Data joined: {{ result.date_joined }}<br>
	6	+Registred in: <a href='#'>User</a><br>
6	7	</div>
7		-
...	...
...	...	@@ -0,0 +1,4 @@
	1	+{% load i18n tz highlight search_preview_templates %}
	2	+
	3	+{% get_search_preview_templates result as template_target %}
	4	+{% include template_target %}
...	...
...	...	@@ -0,0 +1,18 @@
	1	+from django import template
	2	+
	3	+
	4	+register = template.Library()
	5	+
	6	+@register.assignment_tag
	7	+def get_search_preview_templates(model_indexed):
	8	+ app_type = model_indexed.type
	9	+ app_name = ""
	10	+
	11	+ if app_type in "user":
	12	+ app_name = "accounts"
	13	+ elif app_type in "thread":
	14	+ app_name = "superarchives"
	15	+ else:
	16	+ app_name, app_type = app_type.split("_",1)
	17	+
	18	+ return "{}/{}_search_preview.html".format(app_name, app_type)
...	...
...	...	@@ -1,18 +0,0 @@
1		-{% load i18n tz highlight %}
2		-
3		-{% if result.type in "user" %}
4		- {% include "accounts/user_search_preview.html" with user=result %}
5		-{% endif %}
6		-
7		-{% if result.type in "thread" %}
8		- {% include "superarchives/thread_search_preview.html" with thread=result %}
9		-{% endif%}
10		-
11		-{% if result.type in "noosfero_community"%}
12		- {% include "noosfero/community_search_preview.html" with community=result %}
13		-{% endif%}
14		-
15		-{% if result.type in "noosfero_article"%}
16		- {% include "noosfero/article_search_preview.html" with article=result %}
17		-{% endif%}
18		-
1	1	{% load i18n tz highlight %}
2	2
3	3	<div>
4		-<h3> {{ thread.title }}</h3>
5		-{{ thread.latest_description }}
	4	+<h3> {{ result.title }}</h3>
	5	+{{ result.latest_description\|truncatewords:"85" }}
6	6	<br>
7		-{{ thread.modified_by }} - {{ thread.modified \|date:"d \d\e F \d\e Y" }}
	7	+{{ result.modified_by }} - {{ result.modified \|date:"d \d\e F \d\e Y" }}
8	8	<br>
9	9	</div>
...	...