Remove UserArtists

app/models.py

@@ -131,6 +131,14 @@ def add(cls, user, artist):
         except IntegrityError:
             pass
 
+    @classmethod
+    def remove(cls, user, mbids):
+        with transaction.commit_on_success():
+            for mbid in mbids:
+                q = cls.objects.filter(user__id=user.id)
+                q = q.filter(artist__mbid=mbid)
+                q.delete()
+
 class UserProfile(models.Model):
 
     code_length = 16

app/views.py

@@ -176,6 +176,23 @@ def artists_add(request):
     messages.success(request, "%s has been added!" % artist.name)
     return redirect('/artists')
 
+@login_required
+def artists_remove(request):
+    names = request.POST.getlist('name')
+    mbids = request.POST.getlist('id')
+    if not names and not mbids:
+        messages.info(request, 'Use checkboxes to select the artists you want to remove.')
+        return redirect('/artists')
+
+    if names:
+        UserSearch.remove(request.user, names)
+        messages.success(request, 'Removed %d pending artists.' % len(names))
+        return redirect('/artists')
+
+    UserArtist.remove(request.user, mbids)
+    messages.success(request, 'Removed %d artist%s.' % (len(mbids), 's' if len(mbids) > 1 else ''))
+    return redirect('/artists')
+
 def blog(request):
     posts = get_posts()
     root =  request.build_absolute_uri('/')

templates/artists.html

@@ -119,27 +119,27 @@ <h2>Artists you are following:</h2>
 
     $("#name-all").click(function() {
         var checked_status = this.checked;
-        $("input[@name=name]").each(function() {
+        $("input[name=name]").each(function() {
             this.checked = checked_status;
         });
     });
 
     $("#id-all").click(function() {
         var checked_status = this.checked;
-        $("input[@name=id]").each(function() {
+        $("input[name=id]").each(function() {
             this.checked = checked_status;
         });
     });
 
     $("#form-pending").submit(function() {
-        var checked = $("input[@name=name]:checked").length;
+        var checked = $("input[name=name]:checked").length;
         if(checked < 2) return true;
         return confirm("Are you sure you want to remove " +
             checked.toString() + " artists?");
     });
 
     $("#form-artists").submit(function() {
-        var checked = $("input[@name=id]:checked").length;
+        var checked = $("input[name=id]:checked").length;
         if(checked < 2) return true;
         return confirm("Are you sure you want to remove " +
             checked.toString() + " artists?");

urls.py

@@ -27,7 +27,7 @@
     (r'^artist/([0-9a-f\-]+)$', 'artist'),
     (r'^artists$', 'artists'),
     (r'^artists-add$', 'artists_add'),
-#    (r'^artists-remove$', 'artists_remove'),
+    (r'^artists-remove$', 'artists_remove'),
     (r'^blog$', 'blog'),
     (r'^blog/feed$', 'blog_feed'),
 #    (r'^calendar$', 'calendar'),