Download as
Browse Code »

Commit eab32d0938963d64adae6e00de1cc0f6acba5388

Authored by Sergio Oliveira
1 parent 3d4ef19d
Exists in master and in 39 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, check-port, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_cache_count_spb, fix_header, fixed_gitlab_import, go_to_profile_panel, header_footer, layout-fix, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, spb-release/3.0, split_screen, stable, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

Commenting trac stuff out 

the TRAC_ENABLED variable is no longer available. This code needs to be
migrated somehow to proxy.trac app
Showing 2 changed files with 119 additions and 119 deletions   Show diff stats
src/home/views.py
  Diff comments   View file @eab32d0
... ... @@ -27,19 +27,19 @@ def index(request):
27 27 type='thread',
28 28 ).count()
29 29 # TODO: this section should be inside trac app and only use it here
30   - if settings.TRAC_ENABLED:
31   - for type in ['changeset', 'attachment']:
32   - count_types[type] = SearchQuerySet().filter(
33   - type=type,
34   - ).count()
35   -
36   - count_types['ticket'] = sum([
37   - ticket.count for ticket in TicketCollabCount.objects.all()
38   - ])
39   -
40   - count_types['wiki'] = sum([
41   - wiki.count for wiki in WikiCollabCount.objects.all()
42   - ])
  30 + #if settings.TRAC_ENABLED:
  31 + # for type in ['changeset', 'attachment']:
  32 + # count_types[type] = SearchQuerySet().filter(
  33 + # type=type,
  34 + # ).count()
  35 +
  36 + # count_types['ticket'] = sum([
  37 + # ticket.count for ticket in TicketCollabCount.objects.all()
  38 + # ])
  39 +
  40 + # count_types['wiki'] = sum([
  41 + # wiki.count for wiki in WikiCollabCount.objects.all()
  42 + # ])
43 43  
44 44 cache.set('home_chart', count_types)
45 45  
... ...
src/search/views.py
  Diff comments   View file @eab32d0
... ... @@ -29,112 +29,112 @@ class ColabSearchView(SearchView):
29 29 },
30 30 }
31 31 # TODO: Replace for a more generic plugin architecture
32   - if settings.TRAC_ENABLED:
33   - types['wiki'] = {
34   - 'name': _(u'Wiki'),
35   - 'fields': (
36   - ('author', _(u'Author'), self.request.GET.get('author')),
37   - (
38   - 'collaborators',
39   - _(u'Collaborators'),
40   - self.request.GET.get('collaborators'),
41   - ),
42   - ),
43   - }
44   -
45   - types['ticket'] = {
46   - 'name': _(u'Ticket'),
47   - 'fields': (
48   - (
49   - 'milestone',
50   - _(u'Milestone'),
51   - self.request.GET.get('milestone')
52   - ),
53   - (
54   - 'priority',
55   - _(u'Priority'),
56   - self.request.GET.get('priority')
57   - ),
58   - (
59   - 'component',
60   - _(u'Component'),
61   - self.request.GET.get('component')
62   - ),
63   - (
64   - 'severity',
65   - _(u'Severity'),
66   - self.request.GET.get('severity')
67   - ),
68   - (
69   - 'reporter',
70   - _(u'Reporter'),
71   - self.request.GET.get('reporter')
72   - ),
73   - ('author', _(u'Author'), self.request.GET.get('author')),
74   - ('tag', _(u'Status'), self.request.GET.get('tag')),
75   - (
76   - 'keywords',
77   - _(u'Keywords'),
78   - self.request.GET.get('keywords'),
79   - ),
80   - (
81   - 'collaborators',
82   - _(u'Collaborators'),
83   - self.request.GET.get('collaborators')
84   - ),
85   - ),
86   - }
87   -
88   - types['changeset'] = {
89   - 'name': _(u'Changeset'),
90   - 'fields': (
91   - ('author', _(u'Author'), self.request.GET.get('author')),
92   - (
93   - 'repository_name',
94   - _(u'Repository'),
95   - self.request.GET.get('repository_name'),
96   - ),
97   - )
98   - }
99   -
100   - types['user'] = {
101   - 'name': _(u'User'),
102   - 'fields': (
103   - (
104   - 'username',
105   - _(u'Username'),
106   - self.request.GET.get('username'),
107   - ),
108   - ('name', _(u'Name'), self.request.GET.get('name')),
109   - (
110   - 'institution',
111   - _(u'Institution'),
112   - self.request.GET.get('institution'),
113   - ),
114   - ('role', _(u'Role'), self.request.GET.get('role'))
115   - ),
116   - }
117   -
118   - types['attachment'] = {
119   - 'name': _(u'Attachment'),
120   - 'fields': (
121   - (
122   - 'filename',
123   - _(u'Filename'),
124   - self.request.GET.get('filename')
125   - ),
126   - ('author', _(u'Author'), self.request.GET.get('author')),
127   - (
128   - 'used_by',
129   - _(u'Used by'), self.request.GET.get('used_by')),
130   - (
131   - 'mimetype',
132   - _(u'File type'),
133   - self.request.GET.get('mimetype')
134   - ),
135   - ('size', _(u'Size'), self.request.GET.get('size')),
136   - )
137   - }
  32 + #if settings.TRAC_ENABLED:
  33 + # types['wiki'] = {
  34 + # 'name': _(u'Wiki'),
  35 + # 'fields': (
  36 + # ('author', _(u'Author'), self.request.GET.get('author')),
  37 + # (
  38 + # 'collaborators',
  39 + # _(u'Collaborators'),
  40 + # self.request.GET.get('collaborators'),
  41 + # ),
  42 + # ),
  43 + # }
  44 +
  45 + # types['ticket'] = {
  46 + # 'name': _(u'Ticket'),
  47 + # 'fields': (
  48 + # (
  49 + # 'milestone',
  50 + # _(u'Milestone'),
  51 + # self.request.GET.get('milestone')
  52 + # ),
  53 + # (
  54 + # 'priority',
  55 + # _(u'Priority'),
  56 + # self.request.GET.get('priority')
  57 + # ),
  58 + # (
  59 + # 'component',
  60 + # _(u'Component'),
  61 + # self.request.GET.get('component')
  62 + # ),
  63 + # (
  64 + # 'severity',
  65 + # _(u'Severity'),
  66 + # self.request.GET.get('severity')
  67 + # ),
  68 + # (
  69 + # 'reporter',
  70 + # _(u'Reporter'),
  71 + # self.request.GET.get('reporter')
  72 + # ),
  73 + # ('author', _(u'Author'), self.request.GET.get('author')),
  74 + # ('tag', _(u'Status'), self.request.GET.get('tag')),
  75 + # (
  76 + # 'keywords',
  77 + # _(u'Keywords'),
  78 + # self.request.GET.get('keywords'),
  79 + # ),
  80 + # (
  81 + # 'collaborators',
  82 + # _(u'Collaborators'),
  83 + # self.request.GET.get('collaborators')
  84 + # ),
  85 + # ),
  86 + # }
  87 +
  88 + # types['changeset'] = {
  89 + # 'name': _(u'Changeset'),
  90 + # 'fields': (
  91 + # ('author', _(u'Author'), self.request.GET.get('author')),
  92 + # (
  93 + # 'repository_name',
  94 + # _(u'Repository'),
  95 + # self.request.GET.get('repository_name'),
  96 + # ),
  97 + # )
  98 + # }
  99 +
  100 + # types['user'] = {
  101 + # 'name': _(u'User'),
  102 + # 'fields': (
  103 + # (
  104 + # 'username',
  105 + # _(u'Username'),
  106 + # self.request.GET.get('username'),
  107 + # ),
  108 + # ('name', _(u'Name'), self.request.GET.get('name')),
  109 + # (
  110 + # 'institution',
  111 + # _(u'Institution'),
  112 + # self.request.GET.get('institution'),
  113 + # ),
  114 + # ('role', _(u'Role'), self.request.GET.get('role'))
  115 + # ),
  116 + # }
  117 +
  118 + # types['attachment'] = {
  119 + # 'name': _(u'Attachment'),
  120 + # 'fields': (
  121 + # (
  122 + # 'filename',
  123 + # _(u'Filename'),
  124 + # self.request.GET.get('filename')
  125 + # ),
  126 + # ('author', _(u'Author'), self.request.GET.get('author')),
  127 + # (
  128 + # 'used_by',
  129 + # _(u'Used by'), self.request.GET.get('used_by')),
  130 + # (
  131 + # 'mimetype',
  132 + # _(u'File type'),
  133 + # self.request.GET.get('mimetype')
  134 + # ),
  135 + # ('size', _(u'Size'), self.request.GET.get('size')),
  136 + # )
  137 + # }
138 138  
139 139 try:
140 140 type_chosen = self.form.cleaned_data.get('type')
... ...