Adding template tag to check if trac is enable

- Removed trac links from home Signed-off-by: Gustava Jaruga <darksshades@gmail.com> Signed-off-by: Matheus Faria <matheus.sousa.faria@gmail.com>

Adding template tag to check if trac is enable
- Removed trac links from home Signed-off-by: Gustava Jaruga <darksshades@gmail.com> Signed-off-by: Matheus Faria <matheus.sousa.faria@gmail.com>
Gust
1 parent b3108e39
Showing 7 changed files with 51 additions and 28 deletions Show diff stats
src/colab/local_settings-dev.py
src/proxy/search_indexes.py
src/proxy/templatetags/__init__.py
src/proxy/templatetags/proxy.py
src/search/templates/search/includes/search_filters.html
src/super_archives/templatetags/superarchives.py
src/templates/base.html
@@ -27,16 +27,21 @@ CONVERSEJS_BOSH_SERVICE_URL = &#39;http://localhost:5280/http-bind&#39;
 DATABASES['default']['PASSWORD'] = 'colab'
 DATABASES['default']['HOST'] = 'localhost'
+
+TRAC_ENABLED = False
+
 if TRAC_ENABLED:
     DATABASES['trac']['PASSWORD'] = 'colab'
     DATABASES['trac']['HOST'] = 'localhost'
 HAYSTACK_CONNECTIONS['default']['URL'] = 'http://localhost:8983/solr/'
+COLAB_TRAC_URL = 'http://localhost:5000/trac/'
 COLAB_CI_URL = 'http://localhost:8080/ci/'
 COLAB_GITLAB_URL = 'http://localhost:8090/gitlab/'
 COLAB_REDMINE_URL = 'http://localhost:9080/redmine/'
+
 CONVERSEJS_ENABLED = False
 DIAZO_THEME = SITE_URL
@@ -9,7 +9,7 @@ from haystack import indexes
 from haystack.utils import log as logging
 from search.base_indexes import BaseIndex
-from proxy.models import Attachment, Ticket, Wiki, Revision
+from .models import Attachment, Ticket, Wiki, Revision
 logger = logging.getLogger('haystack')
@@ -0,0 +1,12 @@
+from django import template
+
+from super_archives.utils import url
+from django.conf import settings
+
+
+register = template.Library()
+TEMPLATE_PATH = 'proxy/tags/'
+
+@register.assignment_tag
+def is_trac_enable():
+    return settings.TRAC_ENABLED
 \ No newline at end of file
-{% load i18n superarchives %}
+{% load i18n superarchives proxy %}
 {% if filters %}
   <ul class="unstyled-list">
@@ -32,8 +32,4 @@ def pop_from_get(context, **kwargs):
         context['request'].META['PATH_INFO'],
         context['request'].META['QUERY_STRING'],
         **kwargs
-    )
-
-@register.assignment_tag
-def is_trac_enable():
-    return settings.TRAC_ENABLED
 \ No newline at end of file
+    )
 \ No newline at end of file
 <!DOCTYPE html>
-{% load i18n browserid conversejs gravatar %}
+{% load i18n browserid conversejs gravatar proxy %}
+
+{% is_trac_enable as is_trac %}
+
 <html>
   <head>
   {% block head %}
@@ -57,34 +60,41 @@
           </button>
           <a class="navbar-brand" href="/"><img alt="Colab" src="/static/img/logo_nav.png"></a>
         </div>
-
         <div class="collapse navbar-collapse navbar-main">
           <ul class="nav navbar-nav">
-            <li>
-              <a href="/timeline">{% trans "Timeline" %}</a></li>
-            </li>
+
+            {% if is_trac %}
+              <li>
+                <a href="/timeline">{% trans "Timeline" %}</a></li>
+              </li>
+            {% endif %}
+
             <li>
               <a href="{% url 'thread_list' %}">{% trans "Groups" %}</a>
             </li>
             <li>
               <a href="{% url "feedzilla_index" %}">{% trans "Blogs" %}</a>
             </li>
-            <li class="dropdown">
-              <a href="#" class="dropdown-toggle" data-toggle="dropdown">{% trans "Contribute" %} <b class="caret"></b></a>
-              <ul class="dropdown-menu">
-                <li><a href="/wiki">Wiki</a></li>
-                {% if user.is_active %}
-                <li><a href="/wiki/WikiNewPage">{% trans "New Wiki Page" %}</a></li>
-                {% endif %}
-                <li><a href="/report">{% trans "View Tickets" %}</a></li>
-                {% if user.is_active %}
-                <li><a href="/newticket">{% trans "New Ticket" %}</a></li>
-                {% endif %}
-                <li><a href="/roadmap">{% trans "Roadmap" %}</a></li>
-                <li><a href="/browser">{% trans "Browse Source" %}</a></li>
-                <li><a href="/ci">{% trans "Continuous Integration" %}</a></li>
-              </ul>
-            </li>
+
+            {% if is_trac %}
+              <li class="dropdown">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown">{% trans "Contribute" %} <b class="caret"></b></a>
+                <ul class="dropdown-menu">
+                  <li><a href="/wiki">Wiki</a></li>
+                  {% if user.is_active %}
+                  <li><a href="/wiki/WikiNewPage">{% trans "New Wiki Page" %}</a></li>
+                  {% endif %}
+                  <li><a href="/report">{% trans "View Tickets" %}</a></li>
+                  {% if user.is_active %}
+                  <li><a href="/newticket">{% trans "New Ticket" %}</a></li>
+                  {% endif %}
+                  <li><a href="/roadmap">{% trans "Roadmap" %}</a></li>
+                  <li><a href="/browser">{% trans "Browse Source" %}</a></li>
+                  <li><a href="/ci">{% trans "Continuous Integration" %}</a></li>
+                </ul>
+              </li>
+            {% endif %}
+
             <li class="hidden-lg hidden-md">
               <a href="{% url 'haystack_search' %}?q=">{% trans "Search" %}</a>
             </li>
	@@ -9,7 +9,7 @@ from haystack import indexes		@@ -9,7 +9,7 @@ from haystack import indexes
9	from haystack.utils import log as logging	9	from haystack.utils import log as logging
10		10
11	from search.base_indexes import BaseIndex	11	from search.base_indexes import BaseIndex
12	-from proxy.models import Attachment, Ticket, Wiki, Revision	12	+from .models import Attachment, Ticket, Wiki, Revision
13		13
14		14
15	logger = logging.getLogger('haystack')	15	logger = logging.getLogger('haystack')
	@@ -0,0 +1,12 @@		@@ -0,0 +1,12 @@
		1	+from django import template
		2	+
		3	+from super_archives.utils import url
		4	+from django.conf import settings
		5	+
		6	+
		7	+register = template.Library()
		8	+TEMPLATE_PATH = 'proxy/tags/'
		9	+
		10	+@register.assignment_tag
		11	+def is_trac_enable():
		12	+ return settings.TRAC_ENABLED
0	\ No newline at end of file	13	\ No newline at end of file
1	-{% load i18n superarchives %}	1	+{% load i18n superarchives proxy %}
2		2
3	{% if filters %}	3	{% if filters %}
4	<ul class="unstyled-list">	4	<ul class="unstyled-list">