Exclude active speaker from reassignment list.

Fix typo with two selfs, and remove unneeded JS.

speeches/static/speeches/js/select2-override.js

@@ -0,0 +1,11 @@
+$(function() {
+    // Override this small function to include the object ID if we have it.
+    var orig_get_url_params = django_select2.get_url_params;
+    django_select2.get_url_params = function (term, page, context) {
+        var res = orig_get_url_params(term, page, context);
+        if (matches = window.location.pathname.match(/\/([0-9]+)\/delete$/)) {
+            res['object_id'] = matches[1];
+        }
+        return res;
+    };
+});

speeches/templates/speeches/base.html

@@ -11,6 +11,7 @@
         {% endblock extra_css %}
 
         <script type="text/javascript" src="{% static "speeches/js/jquery.js" %}" charset="utf-8"></script>
+        <script type="text/javascript" src="{% static "speeches/js/select2-override.js" %}" charset="utf-8"></script>
         {% block extra_js_head %}{% endblock %}
     </head>
 

speeches/templates/speeches/speaker_delete.html

@@ -15,9 +15,6 @@
   {% if LANGUAGE_CODE == 'es' %}
     <script src="{% static "speeches/js/select2_locale_es.js" %}"></script>
   {% endif %}
-  <script type="text/javascript" src="{% static "speeches/js/jQuery-File-Upload/js/vendor/jquery.ui.widget.js" %}" charset="utf-8"></script>
-  <script type="text/javascript" src="{% static "speeches/js/jQuery-File-Upload/js/jquery.iframe-transport.js" %}" charset="utf-8"></script>
-  <script type="text/javascript" src="{% static "speeches/js/jQuery-File-Upload/js/jquery.fileupload.js" %}" charset="utf-8"></script>
 {% endblock %}
 
 {% block title %}

speeches/views.py

@@ -303,7 +303,7 @@ def delete(self):
 
     def post(self, request, *args, **kwargs):
         if self.object.speech_set.exists():
-            return super(SpeakerDeleteNoSpeechesMixin, self).post(self, request, *args, **kwargs)
+            return super(SpeakerDeleteNoSpeechesMixin, self).post(request, *args, **kwargs)
         else:
             return self.delete()
 
@@ -604,5 +604,13 @@ class Select2AutoResponseView(AutoResponseView):
     def check_all_permissions(self, request, *args, **kwargs):
         super(Select2AutoResponseView, self).check_all_permissions(request, *args, **kwargs)
 
+        try:
+            id = int(request.GET['object_id'])
+        except:
+            id = None
+
         model = request._AutoResponseView__django_select2_local.model
-        request._AutoResponseView__django_select2_local.queryset = model.objects.for_instance(request.instance)
+        qs = model.objects.for_instance(request.instance)
+        if id:
+            qs = qs.exclude(id=id)
+        request._AutoResponseView__django_select2_local.queryset = qs