playlist add does not allow the same item several times in playlist anymore.

diff --git a/telemeta/templates/search/addplaylist.html b/telemeta/templates/search/addplaylist.html
index eed259cc92624ec9ae0d39d105668b5fd5102942..e217921a5702f58ee10fde77d36df1922e3cdea8 100644 (file)
--- a/telemeta/templates/search/addplaylist.html
+++ b/telemeta/templates/search/addplaylist.html
@@ -78,7 +78,7 @@
       {% for item in selected_items_list %}
           <input type="hidden" name="item_id" value="{{item.id}}"/>
       {% endfor %}
-      <input type="submit" value="add to playlist"/>
+      <button style="margin-top:10px" type="submit" id="btn" class="btn btn-default">{% trans "Add to Playlist" %}</button>
   </form>
 {% endblock %}
 {% block extra_javascript %}

diff --git a/telemeta/templates/search/advanceSearch.html b/telemeta/templates/search/advanceSearch.html
index 9c121cf099821927ddabb42822d1ada37024e82a..22173f2daff0623507d69c92dfc2f18c378d7316 100644 (file)
--- a/telemeta/templates/search/advanceSearch.html
+++ b/telemeta/templates/search/advanceSearch.html
@@ -177,7 +177,7 @@
             </div>
         </div></br>
         <button id="btn" class="btn btn-default col-md-10 col-md-offset-1" type="submit">{% trans "Search" %}</button></br></br>
-
+    </form>
 
         {% if query %}
             <h1>{% trans "Results" %}</h1>
@@ -188,6 +188,7 @@
                     <p><b><a href="{% url "haystack_advance_search_type" "item" %}?{{request.GET.urlencode}}">Items ({{item_count}}) </a>| Collections ({{collection_count}})</b></p>
                 {% endifequal %}
              {% endifequal %}
+             <form method="POST" action="{% url "haystack_playlist"%} ">{% csrf_token %}
              {% with object_list as items %}
                 <div class="fullpage">
                     {% ifequal type 'item' %}
@@ -207,10 +208,14 @@
                     </div>
                 {% endif %}
             {% endwith %}
+            {% if user.is_authenticated %}
+                <button style="margin-top:10px" type="submit" id="btn" class="btn btn-default">{% trans "Add to playlist" %}</button>
+            {% endif %}
+            </form>
         {% else %}
             {# Show some example queries to run, maybe query syntax, something else? #}
         {% endif %}
-    </form>
+
 {% endblock %}
 {% block extra_javascript %}
     <script src="{{ STATIC_URL }}telemeta/js/jquery.js" type="text/javascript"></script>
@@ -253,6 +258,18 @@
             $("#id_physical_format").selectmenu({
                 icons : {button: "ui-icon-carat-2-n-s"}
             }).selectmenu("menuWidget").addClass("overflow");
+            $("#selectAll").click(function(){
+                if(this.checked){
+                    $(".check1").each(function(){
+                        this.checked=true;
+                    });
+                }
+                else{
+                    $(".check1").each(function(){
+                        this.checked=false;
+                    });
+                }
+            });
 
         });
     </script>

diff --git a/telemeta/views/new_playlist.py b/telemeta/views/new_playlist.py
index a00fcb8b993a6b060622dac562db0b375ddabc11..6d97946e7b42d5fe1f931ba4e2edac48441ddcb6 100644 (file)
--- a/telemeta/views/new_playlist.py
+++ b/telemeta/views/new_playlist.py
@@ -29,8 +29,7 @@ class NewPlaylistView(object):
             itemlist.append(MediaItem.objects.all().get(id=itemid))
 
         for item in itemlist:
-            resource = PlaylistResource(resource_type='item',public_id='4567891542',resource_id=item.id,playlist=selected_playlist)
-            resource.save()
+            resource = PlaylistResource.objects.get_or_create(resource_type='item',public_id='4567891542',resource_id=item.id,playlist=selected_playlist)
 
         context = RequestContext(request, {
                 'existing_playlists': request.user.username})