diff --git a/colab/accounts/templatetags/gravatar.py b/colab/accounts/templatetags/gravatar.py index 78b0368..153840b 100644 --- a/colab/accounts/templatetags/gravatar.py +++ b/colab/accounts/templatetags/gravatar.py @@ -1,20 +1,13 @@ from django import template -from colab.super_archives.models import EmailAddress - register = template.Library() @register.simple_tag(takes_context=True) def gravatar(context, email, size=80): - if isinstance(email, basestring): - try: - email = EmailAddress.objects.get(address=email) - except EmailAddress.DoesNotExist: - pass - + email_md5 = getattr(email, 'md5', 'anonymous') request = context.get('request') diff --git a/colab/accounts/views.py b/colab/accounts/views.py index 5b206e8..ff487f4 100644 --- a/colab/accounts/views.py +++ b/colab/accounts/views.py @@ -11,8 +11,6 @@ from django.core.exceptions import PermissionDenied from django.views.generic import DetailView, UpdateView from django.http import Http404 -from colab.super_archives.models import (EmailAddress, - EmailAddressValidation) from colab.search.utils import get_collaboration_data, get_visible_threads from colab.accounts.models import User @@ -103,22 +101,6 @@ def signup(request): user.is_active = False user.save() - email = EmailAddressValidation.create(user.email, user) - - location = reverse('archive_email_view', - kwargs={'key': email.validation_key}) - verification_url = request.build_absolute_uri(location) - EmailAddressValidation.verify_email(email, verification_url) - - # Check if the user's email have been used previously - # in the mainling lists to link the user to old messages - email_addr, created = EmailAddress.objects.get_or_create( - address=user.email) - if created: - email_addr.real_name = user.get_full_name() - - email_addr.user = user - email_addr.save() mailing_lists = lists_form.cleaned_data.get('lists') mailman.update_subscription(user.email, mailing_lists) diff --git a/colab/home/views.py b/colab/home/views.py index 48d3a73..a94dbdc 100644 --- a/colab/home/views.py +++ b/colab/home/views.py @@ -3,7 +3,6 @@ from django.shortcuts import render from django.http import HttpResponse, Http404 from colab.search.utils import get_collaboration_data -from colab.super_archives.models import Thread from colab.accounts.utils import mailman from colab.accounts.models import User @@ -22,9 +21,9 @@ def get_user_threads(threads, lists_for_user, key): def dashboard(request): """Dashboard page""" - highest_score_threads = Thread.highest_score.all() + highest_score_threads = [] # TODO - all_threads = Thread.objects.all() + all_threads = [] # TODO latest_threads = [] lists_for_user = [] diff --git a/colab/rss/feeds.py b/colab/rss/feeds.py index c17056e..cd9462f 100644 --- a/colab/rss/feeds.py +++ b/colab/rss/feeds.py @@ -6,15 +6,12 @@ from django.utils.translation import ugettext as _ from haystack.query import SearchQuerySet -from colab.super_archives.models import Thread - - class LatestThreadsFeeds(Feed): title = _(u'Latest Discussions') link = '/rss/threads/latest/' def items(self): - return Thread.objects.all()[:20] + return [] def item_link(self, item): return item.latest_message.url @@ -33,7 +30,7 @@ class HottestThreadsFeeds(Feed): link = '/rss/threads/hottest/' def items(self): - return Thread.highest_score.all()[:20] + return [] def item_link(self, item): return item.latest_message.url diff --git a/colab/search/fixtures/test_data.json b/colab/search/fixtures/test_data.json index e6d0f96..f801375 100644 --- a/colab/search/fixtures/test_data.json +++ b/colab/search/fixtures/test_data.json @@ -1,114 +1,6 @@ [ { "fields": { - "logo": "", - "description": "", - "last_imported_index": 0, - "name": "ListA", - "email": "listA@example.com" - }, - "model": "super_archives.mailinglist", - "pk": 1 -}, -{ - "fields": { - "logo": "", - "description": "", - "last_imported_index": 0, - "name": "ListB", - "email": "listB@example.com" - }, - "model": "super_archives.mailinglist", - "pk": 2 -}, -{ - "fields": { - "logo": "", - "description": "", - "last_imported_index": 0, - "name": "ListC", - "email": "listC@example.com" - }, - "model": "super_archives.mailinglist", - "pk": 3 -}, -{ - "fields": { - "spam": false, - "subject_token": "Thread_1_on_List_A", - "mailinglist": 1, - "score": 31, - "latest_message": 3 - }, - "model": "super_archives.thread", - "pk": 1 -}, -{ - "fields": { - "spam": false, - "subject_token": "Thread_1_on_List_B", - "mailinglist": 2, - "score": 0, - "latest_message": 4 - }, - "model": "super_archives.thread", - "pk": 3 -}, -{ - "fields": { - "spam": false, - "subject_token": "Thread_1_on_List_C", - "mailinglist": 3, - "score": 0, - "latest_message": 5 - }, - "model": "super_archives.thread", - "pk": 4 -}, -{ - "fields": { - "body": "This is a repply to Thread 1 on list A", - "received_time": "2015-01-28T12:43:00.752Z", - "from_address": 1, - "thread": 1, - "spam": false, - "subject_clean": "Response to Thread 1A", - "message_id": "loreipsum", - "subject": "Response to Thread 1A" - }, - "model": "super_archives.message", - "pk": 3 -}, -{ - "fields": { - "body": "This is a repply to Thread 1 on list B", - "received_time": "2015-01-28T12:57:22.180Z", - "from_address": 1, - "thread": 3, - "spam": false, - "subject_clean": "Message 1 on Thread 1B", - "message_id": "", - "subject": "Message 1 on Thread 1B" - }, - "model": "super_archives.message", - "pk": 4 -}, -{ - "fields": { - "body": "This is a repply to Thread 1 on list C", - "received_time": "2015-01-28T13:02:12.903Z", - "from_address": 1, - "thread": 4, - "spam": false, - "subject_clean": "Message 1 on Thread 1C", - "message_id": "", - "subject": "Message 1 on Thread 1C" - }, - "model": "super_archives.message", - "pk": 5 -}, -{ - "fields": { "last_name": "Administrator", "webpage": "", "twitter": "", @@ -194,15 +86,5 @@ }, "model": "accounts.user", "pk": 3 -}, -{ - "fields": { - "real_name": "Administrator", - "user": 1, - "md5": "edb0e96701c209ab4b50211c856c50c4", - "address": "admin@mail.com" - }, - "model": "super_archives.emailaddress", - "pk": 1 } ] diff --git a/colab/search/forms.py b/colab/search/forms.py index f90b162..5642d09 100644 --- a/colab/search/forms.py +++ b/colab/search/forms.py @@ -9,8 +9,6 @@ from haystack.forms import SearchForm from haystack.inputs import AltParser from haystack.inputs import AutoQuery -from colab.super_archives.models import MailingList - class ColabSearchForm(SearchForm): q = forms.CharField(label=_('Search'), required=False) @@ -24,8 +22,7 @@ class ColabSearchForm(SearchForm): list = forms.MultipleChoiceField( required=False, label=_(u'Mailinglist'), - choices=[(v, v) for v in MailingList.objects.values_list( - 'name', flat=True)] + choices=[('TODO', 'TODO')] ) milestone = forms.CharField(required=False, label=_(u'Milestone')) priority = forms.CharField(required=False, label=_(u'Priority')) diff --git a/colab/settings.py b/colab/settings.py index d6f7ada..3fb76dd 100644 --- a/colab/settings.py +++ b/colab/settings.py @@ -53,7 +53,6 @@ INSTALLED_APPS = ( 'colab', 'colab.home', 'colab.plugins', - 'colab.super_archives', 'colab.rss', 'colab.search', 'colab.tz', @@ -192,7 +191,6 @@ TEMPLATE_CONTEXT_PROCESSORS = ( 'django.core.context_processors.tz', 'django.contrib.messages.context_processors.messages', 'django.core.context_processors.request', - 'colab.super_archives.context_processors.mailarchive', 'colab.plugins.context_processors.colab_apps', 'colab.home.context_processors.robots', 'colab.home.context_processors.ribbon', @@ -217,7 +215,6 @@ AUTHENTICATION_BACKENDS = ( LOCALE_PATHS = ( os.path.join(BASE_DIR, 'locale'), - os.path.join(BASE_DIR, 'super_archives/locale'), ) AUTH_USER_MODEL = 'accounts.User' @@ -233,11 +230,6 @@ MESSAGE_TAGS = { # Colab Settings COLAB_HOME_URL = '/dashboard' -# Super Archives -SUPER_ARCHIVES_PATH = '/var/lib/mailman/archives/private' -SUPER_ARCHIVES_EXCLUDE = [] -SUPER_ARCHIVES_LOCK_FILE = '/var/lock/colab/import_emails.lock' - # Mailman API settings MAILMAN_API_URL = 'http://localhost:8124/v2/' diff --git a/colab/urls.py b/colab/urls.py index bd9e229..7d9acd0 100644 --- a/colab/urls.py +++ b/colab/urls.py @@ -20,8 +20,6 @@ urlpatterns = patterns('', url(r'^colab/admin/', include(admin.site.urls)), - url(r'^archives/', include('colab.super_archives.urls')), - url(r'', include('colab.plugins.urls')), ) -- libgit2 0.21.2