diff --git a/src/colab/deprecated/fixtures/generate_fixtures.sh b/src/colab/deprecated/fixtures/generate_fixtures.sh deleted file mode 100755 index acbc8c0..0000000 --- a/src/colab/deprecated/fixtures/generate_fixtures.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -python ../manage.py dumpdata --indent=2 auth.user super_archives > sample_data.json diff --git a/src/colab/deprecated/views/__init__.py b/src/colab/deprecated/views/__init__.py deleted file mode 100644 index 6f804bc..0000000 --- a/src/colab/deprecated/views/__init__.py +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env python -# encoding: utf-8 diff --git a/src/colab/deprecated/views/other.py b/src/colab/deprecated/views/other.py deleted file mode 100644 index f244c06..0000000 --- a/src/colab/deprecated/views/other.py +++ /dev/null @@ -1,85 +0,0 @@ -#!/usr/bin/env python -# encoding: utf-8 -""" -other.py - -Created by Sergio Campos on 2012-01-10. -""" - -import datetime - -from django.template import RequestContext -from django.http import HttpResponseNotAllowed -from django.shortcuts import render_to_response -from django.utils import timezone -from django.utils.translation import ugettext as _ - -from haystack.query import SearchQuerySet - -from super_archives import queries - - -def home(request): - """Index page view""" - - latest_threads = queries.get_latest_threads() - hottest_threads = queries.get_hottest_threads() - - count_types = {} - six_months = timezone.now() - datetime.timedelta(days=180) - for type in ['wiki', 'thread', 'changeset', 'ticket']: - count_types[type] = SearchQuerySet().filter( - type=type, - modified__gte=six_months, - ).count() - - template_data = { - 'hottest_threads': hottest_threads[:6], - 'latest_threads': latest_threads[:6], - 'type_count': count_types, - 'latest_results': SearchQuerySet().all().order_by( - '-modified', '-created' - )[:6], - } - return render_to_response('home.html', template_data, - context_instance=RequestContext(request)) - - -def search(request): - if request.method != 'GET': - return HttpResponseNotAllowed(['GET']) - - query = request.GET.get('q') - sort = request.GET.get('o') - type_ = request.GET.get('type') - try: - page_number = int(request.GET.get('p', '1')) - except ValueError: - page_number = 1 - - try: - results_per_page = int(request.GET.get('per_page', 16)) - except ValueError: - results_per_page = 16 - - filters = { - 'Type': type_, - } - - query = solrutils.build_query(query, filters) - - # Query Solr for results - solr_dict_resp = solrutils.select(query, results_per_page, - page_number, sort) - - docs = solrutils.SolrPaginator(solr_dict_resp, page_number) - - template_data = { - 'docs': docs, - 'anonymous': _(u'anĂ´nimo'), - 'q': query, - 'type': type_, - } - - return render_to_response('search.html', template_data, - RequestContext(request)) diff --git a/src/colab/urls.py b/src/colab/urls.py index 3c1bf67..453b943 100644 --- a/src/colab/urls.py +++ b/src/colab/urls.py @@ -11,7 +11,7 @@ from super_archives.models import Message admin.autodiscover() urlpatterns = patterns('', - url(r'^$', 'colab.deprecated.views.other.home', name='home'), + url(r'^$', 'home.views.index', name='home'), url(r'^search/', include('search.urls')), url(r'open-data/$', TemplateView.as_view(template_name='open-data.html'), diff --git a/src/home/__init__.py b/src/home/__init__.py new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/home/__init__.py diff --git a/src/home/admin.py b/src/home/admin.py new file mode 100644 index 0000000..8c38f3f --- /dev/null +++ b/src/home/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/src/home/models.py b/src/home/models.py new file mode 100644 index 0000000..71a8362 --- /dev/null +++ b/src/home/models.py @@ -0,0 +1,3 @@ +from django.db import models + +# Create your models here. diff --git a/src/home/tests.py b/src/home/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/src/home/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/src/home/views.py b/src/home/views.py new file mode 100644 index 0000000..38c1e21 --- /dev/null +++ b/src/home/views.py @@ -0,0 +1,31 @@ +from django.shortcuts import render + +from django.utils import timezone + +from haystack.query import SearchQuerySet +from super_archives import queries + + +def index(request): + """Index page view""" + + latest_threads = queries.get_latest_threads() + hottest_threads = queries.get_hottest_threads() + + count_types = {} + six_months = timezone.now() - timezone.timedelta(days=180) + for type in ['wiki', 'thread', 'changeset', 'ticket']: + count_types[type] = SearchQuerySet().filter( + type=type, + modified__gte=six_months, + ).count() + + context = { + 'hottest_threads': hottest_threads[:6], + 'latest_threads': latest_threads[:6], + 'type_count': count_types, + 'latest_results': SearchQuerySet().all().order_by( + '-modified', '-created' + )[:6], + } + return render(request, 'home.html', context) -- libgit2 0.21.2