that was just such a terrible idea

Author: ewdurbin

Diff for: requirements/base.txt

@@ -21,7 +21,6 @@ django-taggit==0.15.0
 # Django-reversion 1.9.2 for Django 1.7+
 django-reversion==1.9.2
 Markdown==2.3.1
-django-selectable==0.9.0
 
 django-forms-bootstrap==2.0.3.post1
 django-uni-form==0.9.0

Diff for: symposion/proposals/forms.py

@@ -2,24 +2,17 @@
 from django.db.models import Q
 from django.utils.translation import ugettext_lazy as _
 
-from selectable import forms as selectable
-
 from taggit.forms import TagField
 
 from symposion.proposals.models import SupportingDocument
 
-from .lookups import UserLookup
-
 # @@@ generic proposal form
 
 
 class AddSpeakerForm(forms.Form):
 
-    email = selectable.AutoCompleteSelectField(
-        lookup_class=UserLookup,
-        allow_new=True,
-        label=_("Email address"),
-        required=True,
+    email = forms.EmailField(
+        label="Email address of new speaker (use their email address, not yours)"
     )
 
     def __init__(self, *args, **kwargs):
@@ -28,10 +21,7 @@ def __init__(self, *args, **kwargs):
 
     def clean_email(self):
         value = self.cleaned_data["email"]
-        # django-selectable returns the user
-        if isinstance(value, UserLookup.model):
-            value = value.email
-        if value == self.proposal.speaker.email:
+        if value.lower() == self.proposal.speaker.email.lower():
             raise forms.ValidationError(
                 _("You have submitted the Proposal author's email address. Please" \
                 " select another email address.")
@@ -42,11 +32,10 @@ def clean_email(self):
         ).exists()
         if exists:
             raise forms.ValidationError(
-                _("This email address has already been invited to your talk proposal")
+                "This email address has already been invited to your talk proposal"
             )
         return value
 
-
 class SupportingDocumentCreateForm(forms.ModelForm):
 
     class Meta:

Diff for: symposion/templates/proposals/proposal_speaker_manage.html

@@ -4,18 +4,6 @@
 {% load bootstrap_tags %}
 {% load i18n %}
 
-{% block extra_style %}
-    <link rel="stylesheet" type="text/css"
-            href="//ajax.googleapis.com/ajax/libs/jqueryui/1.10.4/themes/smoothness/jquery-ui.css">
-    <link type="text/css" media="all" rel="stylesheet"
-            href="{{ STATIC_URL }}selectable/css/dj.selectable.css">
-{% endblock extra_style %}
-
-{% comment %}
-Overwriting extra_head_base to remove markedit JS, which causes conflicts
-with selectable (JQuery UI)
-{% endcomment %}
-
 {% block head_title %}Manage Speakers{% endblock head_title %}
 
 {% block body %}
@@ -53,9 +41,3 @@ <h2>{% trans "Add another speaker" %}</h2>
     });
     </script>
 {% endblock %}
-
-
-{% block extra_script %}
-    <script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.10.4/jquery-ui.js"></script>
-    {{ add_speaker_form.media.js }}
-{% endblock extra_script %}

Diff for: symposion/urls.py

@@ -60,7 +60,6 @@
 
         url(r"^boxes/", include("symposion.boxes.urls")),
         url(r"^sitemap/", TemplateView.as_view(template_name="static/sitemap.html"), name="sitemap"),
-        url(r'^selectable/', include('selectable.urls')),
         url(r"^change_language/", symposion.views.change_language, name="change_language"),
         url(r"^mentorship/", include("pycon.mentorship.urls")),
         url(r"^", include("pycon.urls")),