From 4ca718d042046b237b7fc3e29f3d865b3eb6a513 Mon Sep 17 00:00:00 2001 From: mathieu Date: Wed, 13 Apr 2016 10:12:36 +0200 Subject: [PATCH] =?utf8?q?Ajout=20ouverture=20de=20la=20derniere=20liste?= =?utf8?q?=20de=20lecture=20utilis=C3=A9e?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Former-commit-id: 7c93e641e9509f6ea41a8a77634b6105587226e4 --- telemeta/static/telemeta/js/playlist.js | 6 +- telemeta/templates/telemeta/lists.html | 97 ++++++++++++------------- telemeta/templatetags/telemeta_tags.py | 44 ----------- telemeta/urls.py | 2 +- telemeta/views/home.py | 7 +- telemeta/views/playlist.py | 5 +- 6 files changed, 55 insertions(+), 106 deletions(-) diff --git a/telemeta/static/telemeta/js/playlist.js b/telemeta/static/telemeta/js/playlist.js index b4631372..66e1eb6f 100644 --- a/telemeta/static/telemeta/js/playlist.js +++ b/telemeta/static/telemeta/js/playlist.js @@ -113,9 +113,9 @@ var playlistUtils = { }); }, - removeResource: function(id, id_playlist){ - json([id, id_playlist],'telemeta.del_playlist_resource',function(data){ - var id = JSON.parse(data.result).result; + removeResource: function(id, range_playlist){ + json([id, range_playlist],'telemeta.del_playlist_resource',function(data){ + var id = data.result; window.location.pathname = '/desk/lists/open-list-' + id; }); }, diff --git a/telemeta/templates/telemeta/lists.html b/telemeta/templates/telemeta/lists.html index 834ac132..01a2bffc 100644 --- a/telemeta/templates/telemeta/lists.html +++ b/telemeta/templates/telemeta/lists.html @@ -7,6 +7,50 @@ {% endblock %} + +{% block extra_javascript %} + + + + + + +{% comment "added by Killian Mary" %}{% endcomment %} + + +{% endblock %} + {% comment "added by Killian Mary end" %}{% endcomment %} {% comment "added by Killian Mary end" %}{% endcomment %} @@ -45,16 +89,8 @@
- {% startinc playlists|length %} - {% for playlist in playlists %} - {% if playlist.playlist.public_id != last_playlist %} - {% incinc %} - {% else %} - {% bloqueinc %} - {% endif %} -
{{ playlist.playlist.title }}
@@ -124,7 +160,7 @@ {% endif %} {% endfor %} @@ -135,47 +171,4 @@ {% endblock %} -{% block extra_javascript %} - - - - - - -{% comment "added by Killian Mary" %}{% endcomment %} - - - -{% endinc %} -{% endblock %} diff --git a/telemeta/templatetags/telemeta_tags.py b/telemeta/templatetags/telemeta_tags.py index c5e19820..a0850344 100644 --- a/telemeta/templatetags/telemeta_tags.py +++ b/telemeta/templatetags/telemeta_tags.py @@ -467,47 +467,3 @@ def get_googletools(): @register.assignment_tag def settings_value(name): return getattr(settings, name, "") - -cpt = None - -class Inc: - - def __init__(self, limite): - self.var = 0 - self.limite = limite - self.bloque = False - - def inc(self): - if self.bloque == False: - self.var = self.var +1 - if self.var == self.limite: - self.var = 0 - -@register.simple_tag -def startinc(limite): - global cpt - cpt = Inc(limite) - return '' - -@register.simple_tag -def incinc(): - global cpt - cpt.inc() - return '' - -@register.simple_tag -def valinc(): - global cpt - return cpt.var - -@register.simple_tag -def bloqueinc(): - global cpt - cpt.bloque = True - return '' - -@register.simple_tag -def endinc(): - global cpt - cpt = None - return '' diff --git a/telemeta/urls.py b/telemeta/urls.py index 903a31e5..da879443 100644 --- a/telemeta/urls.py +++ b/telemeta/urls.py @@ -190,7 +190,7 @@ urlpatterns = patterns('', url(r'^accounts/$', home_view.users, name="telemeta-users"), # Desk - url(r'^desk/lists/(?:open-list-(?P[0-9]+)/)?$', home_view.lists, name="telemeta-desk-lists"), + url(r'^desk/lists/(?:open-list-(?P[0-9]+)/)?$', home_view.lists, name="telemeta-desk-lists"), url(r'^desk/profile/(?P[A-Za-z0-9@+._-]+)/$', profile_view.profile_detail, name="telemeta-desk-profile"), url(r'^desk/home/$', home_view.home, name="telemeta-desk-home"), diff --git a/telemeta/views/home.py b/telemeta/views/home.py index b784b3ee..ba77fc97 100644 --- a/telemeta/views/home.py +++ b/telemeta/views/home.py @@ -62,7 +62,7 @@ class HomeView(object): 'sound_pub_item': sound_pub_item }) return HttpResponse(template.render(context)) - def lists(self, request, id_playlist): + def lists(self, request, range_playlist): """Render the home page""" if request.user.is_authenticated(): @@ -70,9 +70,10 @@ class HomeView(object): playlists = get_playlists(request) revisions = get_revisions(100) user_revisions = get_revisions(25, request.user) - last_playlist = id_playlist + if range_playlist is None: + range_playlist = 0 return render(request, template, {'playlists': playlists, - 'revisions': revisions, 'user_revisions': user_revisions , 'last_playlist':last_playlist}) + 'revisions': revisions, 'user_revisions': user_revisions , 'last_playlist':range_playlist}) else: template = 'telemeta/messages.html' mess = ugettext('Access not allowed') diff --git a/telemeta/views/playlist.py b/telemeta/views/playlist.py index 9991e53f..9138a721 100644 --- a/telemeta/views/playlist.py +++ b/telemeta/views/playlist.py @@ -69,11 +69,10 @@ class PlaylistView(object): raise 'Error : Bad playlist_resource dictionnary' @jsonrpc_method('telemeta.del_playlist_resource') - def del_playlist_resource(request, public_id, playlist_id): + def del_playlist_resource(request, public_id, playlist_range): m = PlaylistResource.objects.get(public_id=public_id) m.delete() - reponse = {'result': playlist_id, "error":None, "id":"jsonrpc"} - return json.dumps(reponse) + return playlist_range def get_elements(self, playlist, resource_type): resources = PlaylistResource.objects.filter(playlist=playlist) -- 2.39.5
- +