From 2db1738e4a958af48d8bf8fc71319a052a5c35d1 Mon Sep 17 00:00:00 2001
From: Jens Langhammer <jens.langhammer@haufe-lexware.com>
Date: Wed, 27 Feb 2019 14:47:11 +0100
Subject: [PATCH] make Admin UI more consistent, better show when provider has
 no application assigned

---
 .../templates/administration/application/list.html |  4 +++-
 .../templates/administration/factor/list.html      |  2 +-
 .../templates/administration/policy/list.html      |  4 ++--
 .../templates/administration/provider/list.html    | 14 +++++++++++---
 passbook/admin/views/applications.py               |  1 +
 passbook/core/models.py                            |  4 ++++
 passbook/lib/templatetags/utils.py                 |  5 +++++
 passbook/saml_idp/models.py                        |  6 +++---
 8 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/passbook/admin/templates/administration/application/list.html b/passbook/admin/templates/administration/application/list.html
index 7a5df9bd2..20be356fb 100644
--- a/passbook/admin/templates/administration/application/list.html
+++ b/passbook/admin/templates/administration/application/list.html
@@ -21,6 +21,7 @@
             <tr>
                 <th>{% trans 'Name' %}</th>
                 <th>{% trans 'Provider' %}</th>
+                <th>{% trans 'Provider Type' %}</th>
                 <th></th>
             </tr>
         </thead>
@@ -28,7 +29,8 @@
             {% for application in object_list %}
             <tr>
                 <td>{{ application.name }}</td>
-                <td>{{ application.provider }}</td>
+                <td>{{ application.get_provider }}</td>
+                <td>{{ application.get_provider|verbose_name }}</td>
                 <td>
                     <a class="btn btn-default btn-sm"
                         href="{% url 'passbook_admin:application-update' pk=application.uuid %}?back={{ request.get_full_path }}">{% trans 'Edit' %}</a>
diff --git a/passbook/admin/templates/administration/factor/list.html b/passbook/admin/templates/administration/factor/list.html
index 68e78c148..9b73498da 100644
--- a/passbook/admin/templates/administration/factor/list.html
+++ b/passbook/admin/templates/administration/factor/list.html
@@ -40,7 +40,7 @@
             {% for factor in object_list %}
             <tr>
                 <td>{{ factor.name }} ({{ factor.slug }})</td>
-                <td>{{ factor.type }}</td>
+                <td>{{ factor|verbose_name }}</td>
                 <td>{{ factor.order }}</td>
                 <td>{{ factor.enabled }}</td>
                 <td>
diff --git a/passbook/admin/templates/administration/policy/list.html b/passbook/admin/templates/administration/policy/list.html
index 342e92b57..ed41d1512 100644
--- a/passbook/admin/templates/administration/policy/list.html
+++ b/passbook/admin/templates/administration/policy/list.html
@@ -29,7 +29,7 @@
         <thead>
             <tr>
                 <th>{% trans 'Name' %}</th>
-                <th>{% trans 'Class' %}</th>
+                <th>{% trans 'Type' %}</th>
                 <th></th>
             </tr>
         </thead>
@@ -37,7 +37,7 @@
             {% for policy in object_list %}
             <tr>
                 <td>{{ policy.name }}</td>
-                <td>{{ policy|fieldtype }}</td>
+                <td>{{ policy|verbose_name }}</td>
                 <td>
                     <a class="btn btn-default btn-sm"
                         href="{% url 'passbook_admin:policy-update' pk=policy.uuid %}?back={{ request.get_full_path }}">{% trans 'Edit' %}</a>
diff --git a/passbook/admin/templates/administration/provider/list.html b/passbook/admin/templates/administration/provider/list.html
index c47311612..43e84e7ba 100644
--- a/passbook/admin/templates/administration/provider/list.html
+++ b/passbook/admin/templates/administration/provider/list.html
@@ -29,16 +29,24 @@
     <table class="table table-striped table-bordered">
         <thead>
             <tr>
+                <th></th>
                 <th>{% trans 'Name' %}</th>
-                <th>{% trans 'Class' %}</th>
+                <th>{% trans 'Type' %}</th>
                 <th></th>
             </tr>
         </thead>
         <tbody>
             {% for provider in object_list %}
-            <tr>
+            <tr {% if not provider.application %} class="warning" {% endif %}>
+                <th>
+                    {% if not provider.application %}
+                    <span class="pficon-warning-triangle-o" data-toggle="tooltip" data-placement="right" title="{% trans 'Warning: Provider has no application assigned.' %}"></span>
+                    {% else %}
+                    <span class="pficon-ok" data-toggle="tooltip" data-placement="right" title="{% blocktrans with app=provider.application %}Assigned to Application {{ app }}{% endblocktrans %}"></span>
+                    {% endif %}
+                </th>
                 <td>{{ provider.name }}</td>
-                <td>{{ provider|fieldtype }}</td>
+                <td>{{ provider|verbose_name }}</td>
                 <td>
                     <a class="btn btn-default btn-sm"
                         href="{% url 'passbook_admin:provider-update' pk=provider.pk %}?back={{ request.get_full_path }}">{% trans 'Edit' %}</a>
diff --git a/passbook/admin/views/applications.py b/passbook/admin/views/applications.py
index b6ba4ed4c..bf9b5eb37 100644
--- a/passbook/admin/views/applications.py
+++ b/passbook/admin/views/applications.py
@@ -14,6 +14,7 @@ class ApplicationListView(AdminRequiredMixin, ListView):
     """Show list of all applications"""
 
     model = Application
+    ordering = 'name'
     template_name = 'administration/application/list.html'
 
     def get_queryset(self):
diff --git a/passbook/core/models.py b/passbook/core/models.py
index db6c6816e..a8bf4b5e9 100644
--- a/passbook/core/models.py
+++ b/passbook/core/models.py
@@ -161,6 +161,10 @@ class Application(PolicyModel):
         from passbook.core.policies import PolicyEngine
         return PolicyEngine(self.policies.all()).for_user(user).result
 
+    def get_provider(self):
+        """Get casted provider instance"""
+        return Provider.objects.get_subclass(pk=self.provider.pk)
+
     def __str__(self):
         return self.name
 
diff --git a/passbook/lib/templatetags/utils.py b/passbook/lib/templatetags/utils.py
index df2c89311..1ed90740e 100644
--- a/passbook/lib/templatetags/utils.py
+++ b/passbook/lib/templatetags/utils.py
@@ -207,3 +207,8 @@ def gravatar(email, size=None, rating=None):
         gravatar_url += '?' + urlencode(parameters, doseq=True)
 
     return escape(gravatar_url)
+
+@register.filter
+def verbose_name(obj):
+    """Return Object's Verbose Name"""
+    return obj._meta.verbose_name
diff --git a/passbook/saml_idp/models.py b/passbook/saml_idp/models.py
index 18ba9ccf3..55313e081 100644
--- a/passbook/saml_idp/models.py
+++ b/passbook/saml_idp/models.py
@@ -40,12 +40,12 @@ class SAMLProvider(Provider):
 
     def link_download_metadata(self):
         """Get link to download XML metadata for admin interface"""
-        # pylint: disable=no-member
-        if self.application:
+        try:
             # pylint: disable=no-member
             return reverse('passbook_saml_idp:metadata_xml',
                            kwargs={'application': self.application.slug})
-        return None
+        except Provider.application.RelatedObjectDoesNotExist:
+            return None
 
     class Meta: