diff --git a/src/colab/local_settings-dev.py b/src/colab/local_settings-dev.py index 7eb8671..d25a4a6 100644 --- a/src/colab/local_settings-dev.py +++ b/src/colab/local_settings-dev.py @@ -27,16 +27,21 @@ CONVERSEJS_BOSH_SERVICE_URL = 'http://localhost:5280/http-bind' 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 diff --git a/src/proxy/search_indexes.py b/src/proxy/search_indexes.py index 794f019..c7c413f 100644 --- a/src/proxy/search_indexes.py +++ b/src/proxy/search_indexes.py @@ -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') diff --git a/src/proxy/templatetags/__init__.py b/src/proxy/templatetags/__init__.py new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/proxy/templatetags/__init__.py diff --git a/src/proxy/templatetags/proxy.py b/src/proxy/templatetags/proxy.py new file mode 100644 index 0000000..ed84192 --- /dev/null +++ b/src/proxy/templatetags/proxy.py @@ -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 diff --git a/src/search/templates/search/includes/search_filters.html b/src/search/templates/search/includes/search_filters.html index 8cdd437..78fcd2b 100644 --- a/src/search/templates/search/includes/search_filters.html +++ b/src/search/templates/search/includes/search_filters.html @@ -1,4 +1,4 @@ -{% load i18n superarchives %} +{% load i18n superarchives proxy %} {% if filters %}