Begin add multicheckbox select for playlist add

diff --git a/src/django-haystack b/src/django-haystack
index cecb459ff4468a79a43cead3d09e213d0980c080..3c88d41f9a02299d031eef8114dfd4fdc5ed358f 160000 (submodule)
--- a/src/django-haystack
+++ b/src/django-haystack
@@ -1 +1 @@
-Subproject commit cecb459ff4468a79a43cead3d09e213d0980c080
+Subproject commit 3c88d41f9a02299d031eef8114dfd4fdc5ed358f

diff --git a/telemeta/haystack_urls.py b/telemeta/haystack_urls.py
index 566365d9a0e8e6b4fbdd90a4dba020be0479f2db..0eccfcef8727a357df9b1bd5a4c819c87b0a2759 100644 (file)
--- a/telemeta/haystack_urls.py
+++ b/telemeta/haystack_urls.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 from django.conf.urls import patterns, url
 from telemeta.views.haystack_search import *
+from telemeta.views.new_playlist import *
 from haystack.forms import *
 
 urlpatterns = patterns('',
@@ -8,4 +9,5 @@ urlpatterns = patterns('',
     url(r'^quick/(?P<type>[A-Za-z0-9._-]+)/$', HaystackSearch(), name='haystack_search_type'),
     url(r'^advance/$', HaystackAdvanceSearch(form_class=HayAdvanceForm, template='search/advanceSearch.html'), name='haystack_advance_search'),
     url(r'^advance/(?P<type>[A-Za-z0-9._-]+)/$', HaystackAdvanceSearch(form_class=HayAdvanceForm, template='search/advanceSearch.html'), name='haystack_advance_search_type'),
+    url(r'^playlist_add/$', NewPlaylistView.as_view(), name='haystack_playlist'),
 )

diff --git a/telemeta/templates/search/mediaitem_listhaystack.html b/telemeta/templates/search/mediaitem_listhaystack.html
index 103fb6940d0e1d93cd9559bb15c533eb45e57d24..22a2d1575289342ae5d6cd0e89aee86256216f95 100644 (file)
--- a/telemeta/templates/search/mediaitem_listhaystack.html
+++ b/telemeta/templates/search/mediaitem_listhaystack.html
@@ -27,7 +27,7 @@
 {% if user.is_authenticated %}
     {% for result in page.object_list %}
     <tr {% if not forloop.counter0|divisibleby:"2" %}class="odd"{% endif %}>
-        <td class="highlight"><input type="checkbox" class="check1"/></td>
+        <td class="highlight"><input type="checkbox" class="check1" name="selected_items_list" value="{{ result.object.id }}"/></td>
         <td>
             <a href="{% url "telemeta-item-detail" result.object.public_id %}">{{ result.object }}</a></br>
         </td>

diff --git a/telemeta/templates/search/search.html b/telemeta/templates/search/search.html
index 455889b448f8726d4584b39805bb8c19b0da2b28..8ef1ca5222ddfab67e54daae85a35b038bddb59c 100644 (file)
--- a/telemeta/templates/search/search.html
+++ b/telemeta/templates/search/search.html
@@ -34,6 +34,7 @@
              {% endifequal %}
              {% include "search/filters.html" %}
 
+            <form method="GET" action="{% url "haystack_playlist"%} ">
              {% with object_list as items %}
                 <div class="fullpage">
                     {% ifequal type 'item' %}
@@ -53,6 +54,8 @@
                     </div>
                 {% endif %}
             {% endwith %}
+            <button style="margin-top:10px" type="submit" id="btn" class="btn btn-default">{% trans "Add to playlist" %}</button>
+            </form>
         {% else %}
             {# Show some example queries to run, maybe query syntax, something else? #}
         {% endif %}

diff --git a/telemeta/urls.py b/telemeta/urls.py
index cf2adc4ad5e9af45defc708ac7d7e38fa416d9a0..c600fcb9e92c5c3642a1492fe1d32b009a21ed8f 100644 (file)
--- a/telemeta/urls.py
+++ b/telemeta/urls.py
@@ -68,6 +68,7 @@ export_extensions = "|".join(item_view.list_export_extensions())
 urlpatterns = patterns('',
     url(r'^$', home_view.home, name="telemeta-home"),
     url(r'^test', TemplateView.as_view(template_name = "telemeta/hello_world.html")),
+
     # items
     url(r'^archives/items/$', ItemListView.as_view(), name="telemeta-items"),
     url(r'^archives/full_access_items/$', ItemListViewFullAccess.as_view(), name="telemeta-fullaccess-items"),