From dae5fc62650c30b69bbb93ff9036d9c2a212e080 Mon Sep 17 00:00:00 2001
From: Jens Langhammer <jens.langhammer@beryju.org>
Date: Sun, 9 Dec 2018 23:05:55 +0100
Subject: [PATCH] core: cleanup provider select

---
 passbook/admin/templates/administration/base.html | 8 ++++----
 passbook/core/forms/applications.py               | 4 +++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/passbook/admin/templates/administration/base.html b/passbook/admin/templates/administration/base.html
index 5e30d0a1a..1352cabe8 100644
--- a/passbook/admin/templates/administration/base.html
+++ b/passbook/admin/templates/administration/base.html
@@ -14,12 +14,12 @@
   <li class="{% is_active 'passbook_admin:sources' 'passbook_admin:source-create' 'passbook_admin:source-update' 'passbook_admin:source-delete' %}">
     <a href="{% url 'passbook_admin:sources' %}">{% trans 'Sources' %}</a>
   </li>
-  <li class="{% is_active 'passbook_admin:rules' 'passbook_admin:rule-create' 'passbook_admin:rule-update' 'passbook_admin:rule-delete' 'passbook_admin:rule-test' %}">
-    <a href="{% url 'passbook_admin:rules' %}">{% trans 'Rules' %}</a>
-  </li>
   <li class="{% is_active 'passbook_admin:providers' 'passbook_admin:provider-create' 'passbook_admin:provider-update' 'passbook_admin:provider-delete' %}">
     <a href="{% url 'passbook_admin:providers' %}">{% trans 'Providers' %}</a>
   </li>
+  <li class="{% is_active 'passbook_admin:rules' 'passbook_admin:rule-create' 'passbook_admin:rule-update' 'passbook_admin:rule-delete' 'passbook_admin:rule-test' %}">
+    <a href="{% url 'passbook_admin:rules' %}">{% trans 'Rules' %}</a>
+  </li>
   <li>
     <a href="#">{% trans 'Users' %}</a>
   </li>
@@ -27,4 +27,4 @@
     <a href="{% url 'admin:index' %}">{% trans 'Django' %}</a>
   </li>
 </ul>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/passbook/core/forms/applications.py b/passbook/core/forms/applications.py
index 4a1d364b0..17cd4ab41 100644
--- a/passbook/core/forms/applications.py
+++ b/passbook/core/forms/applications.py
@@ -1,12 +1,14 @@
 """passbook Core Application forms"""
 from django import forms
 
-from passbook.core.models import Application
+from passbook.core.models import Application, Provider
 
 
 class ApplicationForm(forms.ModelForm):
     """Application Form"""
 
+    provider = forms.ModelChoiceField(queryset=Provider.objects.all().select_subclasses())
+
     class Meta:
 
         model = Application