Download as
Browse Code »

Commit 8477b7b4585ab8b8f62562c29476a3ea277bbc55

Authored by Gust
Committed by Sergio Oliveira
1 parent 4280f705
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

Fix imports and missing method error 

Signed-off-by: Gustavo Jaruga <darksshades@gmail.com>
Signed-off-by: Alexandre Barbosa <alexandreab@live.com>
Showing 2 changed files with 4 additions and 4 deletions   Show diff stats
colab/home/views.py
  Diff comments   View file @8477b7b
@@ -4,7 +4,7 @@ from django.http import HttpResponse, Http404 @@ -4,7 +4,7 @@ from django.http import HttpResponse, Http404
4 4
5 from colab.search.utils import get_collaboration_data 5 from colab.search.utils import get_collaboration_data
6 from colab.super_archives.models import Thread 6 from colab.super_archives.models import Thread
7 -from colab.accounts.utils import mailinglist 7 +from colab.accounts.utils import mailman
8 from colab.accounts.models import User 8 from colab.accounts.models import User
9 9
10 10
@@ -20,7 +20,7 @@ def dashboard(request): @@ -20,7 +20,7 @@ def dashboard(request):
20 user = None 20 user = None
21 if request.user.is_authenticated(): 21 if request.user.is_authenticated():
22 user = User.objects.get(username=request.user) 22 user = User.objects.get(username=request.user)
23 - lists_for_user = mailinglist.get_user_mailinglists(user) 23 + lists_for_user = mailman.get_user_mailinglists(user)
24 24
25 for t in all_threads: 25 for t in all_threads:
26 if not t.mailinglist.is_private or \ 26 if not t.mailinglist.is_private or \
colab/search/utils.py
  Diff comments   View file @8477b7b
@@ -10,14 +10,14 @@ from django.db.models import Q @@ -10,14 +10,14 @@ from django.db.models import Q
10 10
11 from colab.super_archives.models import Thread, Message 11 from colab.super_archives.models import Thread, Message
12 from colab.proxy.utils.models import Collaboration 12 from colab.proxy.utils.models import Collaboration
13 -from colab.accounts.utils import mailinglist 13 +from colab.accounts.utils import mailman
14 14
15 15
16 def get_visible_threads_queryset(logged_user): 16 def get_visible_threads_queryset(logged_user):
17 qs = Thread.objects 17 qs = Thread.objects
18 lists_for_user = [] 18 lists_for_user = []
19 if logged_user: 19 if logged_user:
20 - lists_for_user = mailinglist.get_user_mailinglists(logged_user) 20 + lists_for_user = mailman.get_user_mailinglists(logged_user)
21 21
22 q1 = Q(mailinglist__name__in=lists_for_user) 22 q1 = Q(mailinglist__name__in=lists_for_user)
23 q2 = Q(mailinglist__is_private=False) 23 q2 = Q(mailinglist__is_private=False)