From: mathieu Date: Mon, 2 May 2016 14:46:50 +0000 (+0200) Subject: Update locale + add_playlist pour les items generaux/dans instrus/dans instrus alias... X-Git-Tag: 1.6.2^2~15^2~6^2~13 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=755083cfd6268dfb3889b2ded03314a006984ab9;p=telemeta.git Update locale + add_playlist pour les items generaux/dans instrus/dans instrus alias (+nb items par page) --- diff --git a/modif telemeta b/modif telemeta index 3a0adafe..7346532c 100644 --- a/modif telemeta +++ b/modif telemeta @@ -1,9 +1,5 @@ -date enreg -> periode enr - en ligne /acces compte marche pas -taille max analyzer ES prod - message attente autoc. verif format cote recherche (ex : _I_1995_ ) simple @@ -54,12 +50,10 @@ autocompletion sur instruments/collecteur (listes fermees) recherche booleenne sur les instruments +date enreg -> periode enr + VERIF PROD : filtre inedits/edites pour les items : passer par la collection puis sa cote (I : inedit, E : edites) -DERNIER COMMIT : -11 avril : Merge branch 'dev' into feature/ts-server -Prob : resolution url (commit 18 avril Merge branch 'dev' of github.com:Parisson/Telemeta into dev ) - diff --git a/telemeta/locale b/telemeta/locale index 935fe71d..308a1e8c 160000 --- a/telemeta/locale +++ b/telemeta/locale @@ -1 +1 @@ -Subproject commit 935fe71dd269b94f3ae97a557abcb5a4410a1f4a +Subproject commit 308a1e8cfbeb2768f3e24660971d774e303e63b3 diff --git a/telemeta/templates/telemeta/inc/mediaitem_list.html b/telemeta/templates/telemeta/inc/mediaitem_list.html index d78fa77d..42683992 100644 --- a/telemeta/templates/telemeta/inc/mediaitem_list.html +++ b/telemeta/templates/telemeta/inc/mediaitem_list.html @@ -2,11 +2,13 @@ {% load i18n %} {% if items %} - +
+{% csrf_token %} - + + {% if location_name %} @@ -21,7 +23,9 @@ {% for item in items %} - + +
{% trans "Title" %} select all {% trans "Title" %} {% trans "Digitized" %} {% trans "Recordist" %}
+ {{ item }} @@ -53,6 +57,10 @@
+ + +
+ {% else %}

{% trans "No item" %}

{% endif %} diff --git a/telemeta/templates/telemeta/media_item_instrument_list.html b/telemeta/templates/telemeta/media_item_instrument_list.html index 50addcac..3f0f782e 100644 --- a/telemeta/templates/telemeta/media_item_instrument_list.html +++ b/telemeta/templates/telemeta/media_item_instrument_list.html @@ -10,17 +10,17 @@ {% block url_published %}{% url "telemeta-items-instrument-published" id %}{% endblock %} {% block url_sound %}{% url "telemeta-items-instrument-sound" id %}{% endblock %} {% block extra_stylesheets %} - + {{ block.super }} {% endblock %} {% block extra_javascript %} + {{ block.super }} - {% endblock %} diff --git a/telemeta/templates/telemeta/mediaitem_list.html b/telemeta/templates/telemeta/mediaitem_list.html index d197e028..a0733a1c 100644 --- a/telemeta/templates/telemeta/mediaitem_list.html +++ b/telemeta/templates/telemeta/mediaitem_list.html @@ -6,37 +6,104 @@ {% block head_title %}{% trans "Media Items" %} {% block instru_name %}{% endblock %}- {{ block.super }}{% endblock %} {% block title %} -
-
- item {% trans "Items" %} {% block instru_name_h %}{% endblock %}({{ page_obj.start_index }} - {{ page_obj.end_index }} / {{ count }}) -
-
-{% bootstrap_paginate page_obj range=10 show_first_last="True" %} -
-
 
-
+
+
+ item {% trans "Items" %} + {% block instru_name_h %}{% endblock %}({{ page_obj.start_index }} - {{ page_obj.end_index }} / {{ count }}) +
+
+ {% bootstrap_paginate page_obj range=10 show_first_last="True" %} +
+
 
+
{% endblock %} {% block title_buttons %} -
- - -
+
+ + + +
+ +
+ +
+ +
+
{% endblock %} {% block content %} -{% with object_list as items %} -
-{% include "telemeta/inc/mediaitem_list.html" %} -
-{% endwith %} + {% with object_list as items %} +
+ {% include "telemeta/inc/mediaitem_list.html" %} +
+ {% endwith %} {% endblock %} + +{% block extra_stylesheets %} + +{% endblock %} + + +{% block extra_javascript %} + + + + + +{% endblock %} \ No newline at end of file diff --git a/telemeta/urls.py b/telemeta/urls.py index 28b29e35..c1e1908c 100644 --- a/telemeta/urls.py +++ b/telemeta/urls.py @@ -223,8 +223,9 @@ urlpatterns = patterns('', # Playlists url(r'^playlists/(?P[a-zA-Z0-9]+)/(?P[a-zA-Z0-9]+)/csv/$', playlist_view.playlist_csv_export, name="telemeta-playlist-csv-export"), + url(r'^playlists/playlist_add/$', NewPlaylistView().display, name='playlist'), - # RSS feeds + # RSS feeds url(r'^rss/$', LastestRevisionsFeed(), name="telemeta-rss"), # Static media diff --git a/telemeta/views/item.py b/telemeta/views/item.py index 15e644bf..17e05a5c 100644 --- a/telemeta/views/item.py +++ b/telemeta/views/item.py @@ -412,12 +412,15 @@ class ItemListView(ListView): model = MediaItem template_name = "telemeta/mediaitem_list.html" - paginate_by = 20 queryset = MediaItem.objects.enriched().order_by('code', 'old_code') + def get_paginate_by(self, queryset): + return self.request.GET.get('results_page', 20) + def get_context_data(self, **kwargs): context = super(ItemListView, self).get_context_data(**kwargs) context['count'] = self.object_list.count() + context['results_page'] = int(self.request.GET.get('results_page', 20)) return context class ItemListViewFullAccess(ListView): diff --git a/telemeta/views/new_playlist.py b/telemeta/views/new_playlist.py index 1f7bbf19..fe8d016d 100644 --- a/telemeta/views/new_playlist.py +++ b/telemeta/views/new_playlist.py @@ -5,7 +5,7 @@ import uuid class NewPlaylistView(object): - def display(self, request, type=None): + def display(self, request, type="item"): self.type=type