From eab32d0938963d64adae6e00de1cc0f6acba5388 Mon Sep 17 00:00:00 2001 From: Sergio Oliveira Date: Sat, 20 Sep 2014 19:38:01 -0300 Subject: [PATCH] Commenting trac stuff out --- src/home/views.py | 26 +++++++++++++------------- src/search/views.py | 212 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------------------------------------- 2 files changed, 119 insertions(+), 119 deletions(-) diff --git a/src/home/views.py b/src/home/views.py index df501b4..607f756 100644 --- a/src/home/views.py +++ b/src/home/views.py @@ -27,19 +27,19 @@ def index(request): type='thread', ).count() # TODO: this section should be inside trac app and only use it here - if settings.TRAC_ENABLED: - for type in ['changeset', 'attachment']: - count_types[type] = SearchQuerySet().filter( - type=type, - ).count() - - count_types['ticket'] = sum([ - ticket.count for ticket in TicketCollabCount.objects.all() - ]) - - count_types['wiki'] = sum([ - wiki.count for wiki in WikiCollabCount.objects.all() - ]) + #if settings.TRAC_ENABLED: + # for type in ['changeset', 'attachment']: + # count_types[type] = SearchQuerySet().filter( + # type=type, + # ).count() + + # count_types['ticket'] = sum([ + # ticket.count for ticket in TicketCollabCount.objects.all() + # ]) + + # count_types['wiki'] = sum([ + # wiki.count for wiki in WikiCollabCount.objects.all() + # ]) cache.set('home_chart', count_types) diff --git a/src/search/views.py b/src/search/views.py index d9f4c51..751f18e 100644 --- a/src/search/views.py +++ b/src/search/views.py @@ -29,112 +29,112 @@ class ColabSearchView(SearchView): }, } # TODO: Replace for a more generic plugin architecture - if settings.TRAC_ENABLED: - types['wiki'] = { - 'name': _(u'Wiki'), - 'fields': ( - ('author', _(u'Author'), self.request.GET.get('author')), - ( - 'collaborators', - _(u'Collaborators'), - self.request.GET.get('collaborators'), - ), - ), - } - - types['ticket'] = { - 'name': _(u'Ticket'), - 'fields': ( - ( - 'milestone', - _(u'Milestone'), - self.request.GET.get('milestone') - ), - ( - 'priority', - _(u'Priority'), - self.request.GET.get('priority') - ), - ( - 'component', - _(u'Component'), - self.request.GET.get('component') - ), - ( - 'severity', - _(u'Severity'), - self.request.GET.get('severity') - ), - ( - 'reporter', - _(u'Reporter'), - self.request.GET.get('reporter') - ), - ('author', _(u'Author'), self.request.GET.get('author')), - ('tag', _(u'Status'), self.request.GET.get('tag')), - ( - 'keywords', - _(u'Keywords'), - self.request.GET.get('keywords'), - ), - ( - 'collaborators', - _(u'Collaborators'), - self.request.GET.get('collaborators') - ), - ), - } - - types['changeset'] = { - 'name': _(u'Changeset'), - 'fields': ( - ('author', _(u'Author'), self.request.GET.get('author')), - ( - 'repository_name', - _(u'Repository'), - self.request.GET.get('repository_name'), - ), - ) - } - - types['user'] = { - 'name': _(u'User'), - 'fields': ( - ( - 'username', - _(u'Username'), - self.request.GET.get('username'), - ), - ('name', _(u'Name'), self.request.GET.get('name')), - ( - 'institution', - _(u'Institution'), - self.request.GET.get('institution'), - ), - ('role', _(u'Role'), self.request.GET.get('role')) - ), - } - - types['attachment'] = { - 'name': _(u'Attachment'), - 'fields': ( - ( - 'filename', - _(u'Filename'), - self.request.GET.get('filename') - ), - ('author', _(u'Author'), self.request.GET.get('author')), - ( - 'used_by', - _(u'Used by'), self.request.GET.get('used_by')), - ( - 'mimetype', - _(u'File type'), - self.request.GET.get('mimetype') - ), - ('size', _(u'Size'), self.request.GET.get('size')), - ) - } + #if settings.TRAC_ENABLED: + # types['wiki'] = { + # 'name': _(u'Wiki'), + # 'fields': ( + # ('author', _(u'Author'), self.request.GET.get('author')), + # ( + # 'collaborators', + # _(u'Collaborators'), + # self.request.GET.get('collaborators'), + # ), + # ), + # } + + # types['ticket'] = { + # 'name': _(u'Ticket'), + # 'fields': ( + # ( + # 'milestone', + # _(u'Milestone'), + # self.request.GET.get('milestone') + # ), + # ( + # 'priority', + # _(u'Priority'), + # self.request.GET.get('priority') + # ), + # ( + # 'component', + # _(u'Component'), + # self.request.GET.get('component') + # ), + # ( + # 'severity', + # _(u'Severity'), + # self.request.GET.get('severity') + # ), + # ( + # 'reporter', + # _(u'Reporter'), + # self.request.GET.get('reporter') + # ), + # ('author', _(u'Author'), self.request.GET.get('author')), + # ('tag', _(u'Status'), self.request.GET.get('tag')), + # ( + # 'keywords', + # _(u'Keywords'), + # self.request.GET.get('keywords'), + # ), + # ( + # 'collaborators', + # _(u'Collaborators'), + # self.request.GET.get('collaborators') + # ), + # ), + # } + + # types['changeset'] = { + # 'name': _(u'Changeset'), + # 'fields': ( + # ('author', _(u'Author'), self.request.GET.get('author')), + # ( + # 'repository_name', + # _(u'Repository'), + # self.request.GET.get('repository_name'), + # ), + # ) + # } + + # types['user'] = { + # 'name': _(u'User'), + # 'fields': ( + # ( + # 'username', + # _(u'Username'), + # self.request.GET.get('username'), + # ), + # ('name', _(u'Name'), self.request.GET.get('name')), + # ( + # 'institution', + # _(u'Institution'), + # self.request.GET.get('institution'), + # ), + # ('role', _(u'Role'), self.request.GET.get('role')) + # ), + # } + + # types['attachment'] = { + # 'name': _(u'Attachment'), + # 'fields': ( + # ( + # 'filename', + # _(u'Filename'), + # self.request.GET.get('filename') + # ), + # ('author', _(u'Author'), self.request.GET.get('author')), + # ( + # 'used_by', + # _(u'Used by'), self.request.GET.get('used_by')), + # ( + # 'mimetype', + # _(u'File type'), + # self.request.GET.get('mimetype') + # ), + # ('size', _(u'Size'), self.request.GET.get('size')), + # ) + # } try: type_chosen = self.form.cleaned_data.get('type') -- libgit2 0.21.2