update for panikombo without django-select2 dependency

diff --git a/panikdb/settings.py b/panikdb/settings.py
index cecf46ba7638eeee8079ac985986a6493ced9739..f35d0b8277a868fa29c4ccabf9347f14ee7ac4aa 100644 (file)
--- a/panikdb/settings.py
+++ b/panikdb/settings.py
@@ -174,7 +174,6 @@ INSTALLED_APPS = (
     'combo.apps.search',
     'sorl.thumbnail',
     'panikombo',
-    'django_select2',
     'xstatic.pkg.select2',
 )
 

diff --git a/panikdb/templates/base.html b/panikdb/templates/base.html
index f55ab84d1a2c9dbebf87c9aa0096d60787f28702..4f4c0f27fe3cf0999f9f9b5c9385a5b2e5af9fc4 100644 (file)
--- a/panikdb/templates/base.html
+++ b/panikdb/templates/base.html
@@ -12,7 +12,6 @@
     <script type="text/javascript" src="{{ STATIC_URL }}js/bootstrap-datetimepicker.js"></script>
     <script type="text/javascript" src="{{ STATIC_URL }}js/bootstrap-datetimepicker.fr.js"></script>
     <script type="text/javascript" src="{% xstatic "select2.js" "select2.min.js" %}"></script>
-    <script type="text/javascript" src="/static/django_select2/django_select2.js"></script>
     {% endblock %}
 
     {% block css %}

diff --git a/panikdb/urls.py b/panikdb/urls.py
index 98ca2740485f55a56f41508655892e5b5a461a0d..d1a1dd19f60efaed947ed056564fb8155e850a80 100644 (file)
--- a/panikdb/urls.py
+++ b/panikdb/urls.py
@@ -24,7 +24,7 @@ from .regie.urls import urlpatterns as regie_urlpatterns
 from .oauth.urls import urlpatterns as oauth_urlpatterns
 from .aa.urls import urlpatterns as aa_urlpatterns
 from wiki.urls import urlpatterns as wiki_urlpatterns
-import panikombo.views
+from panikombo.urls import urlpatterns as panikombo_urlpatterns
 
 from .poll import views as poll_views
 from . import views
@@ -78,14 +78,12 @@ urlpatterns = [
          'email_template_name': 'registration/password_reset_email.html'}),
     url(r'^accounts/', include('registration.backends.default.urls')),
 
-    url(r'^combok/soundfiles/', panikombo.views.soundfiles),
-    url(r'^combok/episodes/', panikombo.views.episodes),
-
     url(r'^vote/$', poll_views.vote, name='vote'),
     url(r'^vote/results/$', poll_views.vote_results, name='vote-results'),
     url(r'^ajax/cell/(?P<page_pk>\d+)/(?P<cell_reference>[\w_]+-\d+)/$',
         combo.public.views.ajax_page_cell, name='combo-public-ajax-page-cell'),
 
+    url(r'^panikombo/', include(panikombo_urlpatterns)),
     url(r'^wiki/', include(wiki_urlpatterns)),
     url(r'^regie/', include(regie_urlpatterns)),
     url(r'^oauth/', include(oauth_urlpatterns)),

diff --git a/requirements.txt b/requirements.txt
index e82ee87bccc0926a96669283b000fdc8e2c37fea..153800588d02de62eb8b1263d89b546d00b9ba53 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,4 +10,3 @@ git+http://git.domainepublic.net/git/django-panik-emissions.git
 git+http://git.domainepublic.net/git/django-panik-matos.git
 git+http://git.domainepublic.net/git/django-panik-nonstop.git
 git+http://git.domainepublic.net/git/django-panik-combo.git
-django_select2<5