Download as
Browse Code »

Commit 44c0fb2b55d4348185a9bf9af6fcd1fb76023ce3

Authored by Sergio Oliveira
1 parent 92ac3c87
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

Fixing config

Showing 2 changed files with 25 additions and 16 deletions   Show diff stats
src/colab/custom_settings.py
  Diff comments   View file @44c0fb2
@@ -57,6 +57,17 @@ SOLR_BASE_QUERY = """ @@ -57,6 +57,17 @@ SOLR_BASE_QUERY = """
57 ((Type:changeset OR Type:ticket OR Type:wiki OR Type:thread) AND Title:["" TO *]) 57 ((Type:changeset OR Type:ticket OR Type:wiki OR Type:thread) AND Title:["" TO *])
58 """ 58 """
59 59
  60 +TEMPLATE_CONTEXT_PROCESSORS = (
  61 + 'django.contrib.auth.context_processors.auth',
  62 + 'django.core.context_processors.debug',
  63 + 'django.core.context_processors.i18n',
  64 + 'django.core.context_processors.media',
  65 + 'django.core.context_processors.static',
  66 + 'django.core.context_processors.tz',
  67 + 'django.contrib.messages.context_processors.messages',
  68 + 'django.core.context_processors.request',
  69 +)
  70 +
60 try: 71 try:
61 from local_settings import * 72 from local_settings import *
62 except ImportError: 73 except ImportError:
src/super_archives/views.py
  Diff comments   View file @44c0fb2
@@ -6,7 +6,7 @@ from django.http import Http404 @@ -6,7 +6,7 @@ from django.http import Http404
6 from django.template import RequestContext 6 from django.template import RequestContext
7 from django.core.paginator import Paginator 7 from django.core.paginator import Paginator
8 from django.core.exceptions import ObjectDoesNotExist 8 from django.core.exceptions import ObjectDoesNotExist
9 -from django.shortcuts import render_to_response, get_list_or_404 9 +from django.shortcuts import render, get_list_or_404
10 10
11 from .models import MailingList, Thread 11 from .models import MailingList, Thread
12 12
@@ -16,39 +16,38 @@ def thread(request, mailinglist, thread_token): @@ -16,39 +16,38 @@ def thread(request, mailinglist, thread_token):
16 try: 16 try:
17 first_message = queries.get_first_message_in_thread(mailinglist, thread_token) 17 first_message = queries.get_first_message_in_thread(mailinglist, thread_token)
18 except ObjectDoesNotExist: 18 except ObjectDoesNotExist:
19 - raise Http404 19 + raise Http404
20 order_by = request.GET.get('order') 20 order_by = request.GET.get('order')
21 if order_by == 'voted': 21 if order_by == 'voted':
22 msgs_query = queries.get_messages_by_voted() 22 msgs_query = queries.get_messages_by_voted()
23 else: 23 else:
24 msgs_query = queries.get_messages_by_date() 24 msgs_query = queries.get_messages_by_date()
25 - 25 +
26 msgs_query = msgs_query.filter(thread__subject_token=thread_token) 26 msgs_query = msgs_query.filter(thread__subject_token=thread_token)
27 msgs_query = msgs_query.filter(thread__mailinglist__name=mailinglist) 27 msgs_query = msgs_query.filter(thread__mailinglist__name=mailinglist)
28 emails = msgs_query.exclude(id=first_message.id) 28 emails = msgs_query.exclude(id=first_message.id)
29 - 29 +
30 total_votes = first_message.votes_count() 30 total_votes = first_message.votes_count()
31 for email in emails: 31 for email in emails:
32 total_votes += email.votes_count() 32 total_votes += email.votes_count()
33 33
34 # Update relevance score 34 # Update relevance score
35 query = Thread.objects.filter(mailinglist__name=mailinglist) 35 query = Thread.objects.filter(mailinglist__name=mailinglist)
36 - thread = query.get(subject_token=thread_token) 36 + thread = query.get(subject_token=thread_token)
37 thread.update_score() 37 thread.update_score()
38 - 38 +
39 template_data = { 39 template_data = {
40 'first_msg': first_message, 40 'first_msg': first_message,
41 'emails': [first_message] + list(emails), 41 'emails': [first_message] + list(emails),
42 'pagehits': queries.get_page_hits(request.path_info), 42 'pagehits': queries.get_page_hits(request.path_info),
43 'total_votes': total_votes, 43 'total_votes': total_votes,
44 } 44 }
45 -  
46 - return render_to_response('message-thread.html', template_data,  
47 - RequestContext(request)) 45 +
  46 + return render(request, 'message-thread.html', template_data)
48 47
49 48
50 def list_messages(request): 49 def list_messages(request):
51 - 50 +
52 selected_list = request.GET.get('list') 51 selected_list = request.GET.get('list')
53 52
54 order_by = request.GET.get('order') 53 order_by = request.GET.get('order')
@@ -56,20 +55,20 @@ def list_messages(request): @@ -56,20 +55,20 @@ def list_messages(request):
56 threads = queries.get_hottest_threads() 55 threads = queries.get_hottest_threads()
57 else: 56 else:
58 threads = queries.get_latest_threads() 57 threads = queries.get_latest_threads()
59 - 58 +
60 mail_list = request.GET.get('list') 59 mail_list = request.GET.get('list')
61 if mail_list: 60 if mail_list:
62 threads = threads.filter(mailinglist__name=mail_list) 61 threads = threads.filter(mailinglist__name=mail_list)
63 - 62 +
64 paginator = Paginator(threads, 16) 63 paginator = Paginator(threads, 16)
65 try: 64 try:
66 page = int(request.GET.get('p', '1')) 65 page = int(request.GET.get('p', '1'))
67 except ValueError: 66 except ValueError:
68 page = 1 67 page = 1
69 threads = paginator.page(page) 68 threads = paginator.page(page)
70 - 69 +
71 lists = MailingList.objects.all() 70 lists = MailingList.objects.all()
72 - 71 +
73 template_data = { 72 template_data = {
74 'lists': lists, 73 'lists': lists,
75 'n_results': paginator.count, 74 'n_results': paginator.count,
@@ -77,5 +76,4 @@ def list_messages(request): @@ -77,5 +76,4 @@ def list_messages(request):
77 'selected_list': selected_list, 76 'selected_list': selected_list,
78 'order_by': order_by, 77 'order_by': order_by,
79 } 78 }
80 - return render_to_response('message-list.html', template_data,  
81 - RequestContext(request)) 79 + return render(request, 'message-list.html', template_data)