From 5ca1f1b9c6ddbca7ba55e5e3bb88490fa5692a7d Mon Sep 17 00:00:00 2001 From: afilsaime Date: Mon, 20 Apr 2015 11:09:56 +0200 Subject: [PATCH] ajout des fichiers --- examples/sandbox/src/django-haystack | 1 + .../sandbox/src/pip-delete-this-directory.txt | 5 + telemeta/forms/haystack_form.py | 19 +++ telemeta/haystack_urls.py | 11 ++ .../indexes/telemeta/mediaitem_rec_date.txt | 4 + .../search/mediaitem_listhaystack.html | 55 +++++++ telemeta/templates/telemeta/hello_world.html | 10 ++ telemeta/views/haystack_search.py | 14 ++ telemeta/views/published.py | 141 ++++++++++++++++++ telemeta/views/vuetest.py | 1 + 10 files changed, 261 insertions(+) create mode 160000 examples/sandbox/src/django-haystack create mode 100644 examples/sandbox/src/pip-delete-this-directory.txt create mode 100644 telemeta/forms/haystack_form.py create mode 100644 telemeta/haystack_urls.py create mode 100644 telemeta/templates/search/indexes/telemeta/mediaitem_rec_date.txt create mode 100644 telemeta/templates/search/mediaitem_listhaystack.html create mode 100644 telemeta/templates/telemeta/hello_world.html create mode 100644 telemeta/views/haystack_search.py create mode 100644 telemeta/views/published.py create mode 100644 telemeta/views/vuetest.py diff --git a/examples/sandbox/src/django-haystack b/examples/sandbox/src/django-haystack new file mode 160000 index 00000000..97475f28 --- /dev/null +++ b/examples/sandbox/src/django-haystack @@ -0,0 +1 @@ +Subproject commit 97475f2813a36e402296d5f2389fe10cd4cd1e0b diff --git a/examples/sandbox/src/pip-delete-this-directory.txt b/examples/sandbox/src/pip-delete-this-directory.txt new file mode 100644 index 00000000..c8883ea9 --- /dev/null +++ b/examples/sandbox/src/pip-delete-this-directory.txt @@ -0,0 +1,5 @@ +This file is placed here by pip to indicate the source was put +here by pip. + +Once this package is successfully installed this source code will be +deleted (unless you remove this file). diff --git a/telemeta/forms/haystack_form.py b/telemeta/forms/haystack_form.py new file mode 100644 index 00000000..cf1f5e59 --- /dev/null +++ b/telemeta/forms/haystack_form.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +from django import forms +from haystack.inputs import AutoQuery, Exact, Clean +from haystack.forms import SearchForm +from haystack.query import SearchQuerySet + +class HaySearchForm(SearchForm): + + def search(self): + sqs=SearchQuerySet().load_all() + + if not self.is_valid(): + return sqs + + if self.cleaned_data['q']: + sqs=sqs.filter(content__contains=self.cleaned_data['q']) + + return sqs + diff --git a/telemeta/haystack_urls.py b/telemeta/haystack_urls.py new file mode 100644 index 00000000..684abda7 --- /dev/null +++ b/telemeta/haystack_urls.py @@ -0,0 +1,11 @@ +# -*- coding: utf-8 -*- +from django.conf.urls import patterns, url, include +from telemeta.views.haystack_search import * +from haystack.query import SearchQuerySet +from haystack.views import SearchView +from telemeta.forms.haystack_form import HaySearchForm + + +urlpatterns = patterns('', + url(r'^$', SearchView(form_class=HaySearchForm), name='haystack_search'), +) diff --git a/telemeta/templates/search/indexes/telemeta/mediaitem_rec_date.txt b/telemeta/templates/search/indexes/telemeta/mediaitem_rec_date.txt new file mode 100644 index 00000000..95e99e43 --- /dev/null +++ b/telemeta/templates/search/indexes/telemeta/mediaitem_rec_date.txt @@ -0,0 +1,4 @@ + +{{ object.recorded_from_date }} +{{ object.recorded_to_date }} + diff --git a/telemeta/templates/search/mediaitem_listhaystack.html b/telemeta/templates/search/mediaitem_listhaystack.html new file mode 100644 index 00000000..da50f0f6 --- /dev/null +++ b/telemeta/templates/search/mediaitem_listhaystack.html @@ -0,0 +1,55 @@ +{% load telemeta_utils %} +{% load i18n %} + +{% if page.object_list %} + + + + + + + + + {% if location_name %} + + {% else %} + + {% endif %} + + + +{% for result in page.object_list %} + + + + + + {% if location_name %} + + {% else %} + + {% endif %} + + + +{% endfor %} +
{% trans "Title" %}{% trans "Digitized" %}{% trans "Recordist" %}{% trans "Location" %}{% trans "Country/Continent" %}{% trans "Year of recording" %}{% trans "Code" %}
+ {{ result.object.title }} + + {% if result.file %} + +
+ {% endif %} +
{{ result.object.collector }}{{ result.object.location.name }}{{ result.object.country_or_continent|default:' ' }} + {% if result.object.recorded_from_date %} + {{ result.object.recorded_from_date.year }} + {% if result.object.recorded_to_date and not result.object.recorded_to_date.year|equals:result.object.recorded_from_date.year %} + - {{ result.object.recorded_to_date.year }} + {% endif %} + {% endif %} + + {{ result.object.code|default:result.object.old_code }} +
+{% else %} +

{% trans "No item" %}

+{% endif %} diff --git a/telemeta/templates/telemeta/hello_world.html b/telemeta/templates/telemeta/hello_world.html new file mode 100644 index 00000000..ef6efa2f --- /dev/null +++ b/telemeta/templates/telemeta/hello_world.html @@ -0,0 +1,10 @@ +{% extends "telemeta/base.html" %} +{% load telemeta_utils %} +{% load i18n %} +{% load bootstrap_pagination %} + +{% block content %} +

Hello World

+

Ceci est un test d'affichage

+