adjutant-ui 8.0.0__tar.gz → 9.0.0__tar.gz

{adjutant-ui-8.0.0 → adjutant-ui-9.0.0}/AUTHORS

@@ -3,7 +3,9 @@ Adrian Turjak <adriant@catalystcloud.nz>
 Akihiro Motoki <amotoki@gmail.com>
 Amelia Cordwell <ameliacordwell@catalyst.net.nz>
 Andreas Jaeger <aj@suse.com>
+Callum Dickinson <callum.dickinson@catalystcloud.nz>
 Dale Smith <dale@catalystcloud.nz>
+Dmitriy Rabotyagov <noonedeadpunk@gmail.com>
 Ghanshyam Mann <gmann@ghanshyammann.com>
 Hervé Beraud <hberaud@redhat.com>
 Jonathan Herlin <Jonte@jherlin.se>

{adjutant-ui-8.0.0 → adjutant-ui-9.0.0}/ChangeLog

@@ -1,6 +1,12 @@
 CHANGES
 =======
 
+9.0.0
+-----
+
+* Allow disabling quota management in regions
+* Address RemovedInDjango40Warning (2)
+
 8.0.0
 -----
 

{adjutant-ui-8.0.0 → adjutant-ui-9.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: adjutant-ui
-Version: 8.0.0
+Version: 9.0.0
 Summary: Adjutant User Interface
 Home-page: https://github.com/catalyst/adjutant-ui
 Author: Adrian Turjak

{adjutant-ui-8.0.0 → adjutant-ui-9.0.0}/adjutant_ui/api/adjutant.py

@@ -19,7 +19,7 @@ import requests
 from urllib.parse import urljoin
 
 from django.conf import settings
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from horizon import exceptions
 from horizon.utils import functions as utils
@@ -625,20 +625,24 @@ def size_details_get(request, size, region=None):
     resp = _get_quota_information(request, regions=region)
 
     data = resp['quota_sizes'][size]
-    region_data = resp['regions'][0]['current_quota']
+    try:
+        region = resp['regions'][0]
+    except IndexError:
+        region = {}
+    current_quota = region.get('current_quota', {})
+    current_usage = region.get('current_usage', {})
     for service, values in data.items():
-        if service not in resp['regions'][0]['current_usage']:
-            continue
         for resource, value in values.items():
             if _is_quota_hidden(service, resource):
                 continue
 
-            usage = resp['regions'][0]['current_usage'][service].get(
-                resource)
-            try:
-                percent = float(usage) / value
-            except (TypeError, ZeroDivisionError):
-                percent = '-'
+            quota = current_quota.get(service, {}).get(resource, '-')
+            usage = current_usage.get(service, {}).get(resource, '-')
+            percent = (
+                '-'
+                if not value or usage == '-'
+                else (usage / value)
+            )
 
             quota_details.append(
                 SIZE_QUOTA_VALUE(
@@ -646,7 +650,7 @@ def size_details_get(request, size, region=None):
                     name=resource,
                     service=service,
                     value=value,
-                    current_quota=region_data[service][resource],
+                    current_quota=quota,
                     current_usage=usage,
                     percent=percent
                 )
@@ -659,7 +663,11 @@ def quota_details_get(request, region):
 
     resp = _get_quota_information(request, regions=region)
 
-    data = resp['regions'][0]['current_quota']
+    try:
+        region = resp['regions'][0]
+    except IndexError:
+        region = {}
+    data = region.get('current_quota', {})
 
     for service, values in data.items():
         for name, value in values.items():

{adjutant-ui-8.0.0 → adjutant-ui-9.0.0}/adjutant_ui/content/default/panel.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 import horizon
 

{adjutant-ui-8.0.0 → adjutant-ui-9.0.0}/adjutant_ui/content/email/forms.py

@@ -13,7 +13,7 @@
 #    under the License.
 
 from django.forms import ValidationError
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from horizon import forms
 from horizon import messages

{adjutant-ui-8.0.0 → adjutant-ui-9.0.0}/adjutant_ui/content/email/panel.py

@@ -12,7 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 import horizon
 

{adjutant-ui-8.0.0 → adjutant-ui-9.0.0}/adjutant_ui/content/email/urls.py

@@ -12,11 +12,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from django.conf.urls import url
+from django.urls import re_path
 
 from adjutant_ui.content.email import views
 
 
 urlpatterns = [
-    url(r'^$', views.EmailView.as_view(), name='index')
+    re_path(r'^$', views.EmailView.as_view(), name='index')
 ]

{adjutant-ui-8.0.0 → adjutant-ui-9.0.0}/adjutant_ui/content/email/views.py

@@ -13,7 +13,7 @@
 #    under the License.
 
 from django.urls import reverse_lazy
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from horizon import forms
 

{adjutant-ui-8.0.0 → adjutant-ui-9.0.0}/adjutant_ui/content/forgot_password/forms.py

@@ -15,7 +15,7 @@
 from django.conf import settings
 from django import forms
 from django import http
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from horizon import forms as hforms
 from horizon.utils import functions as utils

{adjutant-ui-8.0.0 → adjutant-ui-9.0.0}/adjutant_ui/content/forgot_password/panel.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 import horizon
 

{adjutant-ui-8.0.0 → adjutant-ui-9.0.0}/adjutant_ui/content/forgot_password/urls.py

@@ -12,12 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from django.conf.urls import url
+from django.urls import re_path
 
 from adjutant_ui.content.forgot_password import views
 
 # NOTE(adriant): These urls are registered in the project_users urls.py file.
 urlpatterns = [
-    url(r'^$', views.ForgotPasswordView.as_view(), name='forgot_index'),
-    url(r'^sent/?$', views.password_sent_view, name='forgot_sent'),
+    re_path(r'^$', views.ForgotPasswordView.as_view(), name='forgot_index'),
+    re_path(r'^sent/?$', views.password_sent_view, name='forgot_sent'),
 ]

{adjutant-ui-8.0.0 → adjutant-ui-9.0.0}/adjutant_ui/content/notifications/panel.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 import horizon
 

{adjutant-ui-8.0.0 → adjutant-ui-9.0.0}/adjutant_ui/content/notifications/tables.py

@@ -13,8 +13,8 @@
 # limitations under the License.
 
 from django.urls import reverse
-from django.utils.translation import ugettext_lazy as _
-from django.utils.translation import ungettext_lazy
+from django.utils.translation import gettext_lazy as _
+from django.utils.translation import ngettext_lazy
 
 from horizon import exceptions
 from horizon import tables
@@ -28,7 +28,7 @@ class AcknowlegeNotifcation(tables.BatchAction):
 
     @staticmethod
     def action_present(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             u"Acknowlege Notification",
             u"Acknowlege Notifications",
             count
@@ -36,7 +36,7 @@ class AcknowlegeNotifcation(tables.BatchAction):
 
     @staticmethod
     def action_past(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             u"Acknowleged Notification",
             u"Acknowleged Notifications",
             count

{adjutant-ui-8.0.0 → adjutant-ui-9.0.0}/adjutant_ui/content/notifications/tabs.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from horizon import exceptions
 from horizon import tabs

{adjutant-ui-8.0.0 → adjutant-ui-9.0.0}/adjutant_ui/content/notifications/urls.py

@@ -13,13 +13,13 @@
 # limitations under the License.
 
 
-from django.conf.urls import url
+from django.urls import re_path
 
 from adjutant_ui.content.notifications import views
 
 
 urlpatterns = [
-    url(r'^$', views.IndexView.as_view(), name='index'),
-    url(r'^(?P<notif_id>[^/]+)/$',
-        views.NotificationDetailView.as_view(), name='detail'),
+    re_path(r'^$', views.IndexView.as_view(), name='index'),
+    re_path(r'^(?P<notif_id>[^/]+)/$',
+            views.NotificationDetailView.as_view(), name='detail'),
 ]

{adjutant-ui-8.0.0 → adjutant-ui-9.0.0}/adjutant_ui/content/notifications/views.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 from django.urls import reverse
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from horizon import exceptions
 from horizon import tabs

{adjutant-ui-8.0.0 → adjutant-ui-9.0.0}/adjutant_ui/content/project_users/forms.py

@@ -14,7 +14,7 @@
 
 from django.conf import settings
 from django.urls import reverse
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from horizon import exceptions
 from horizon import forms

{adjutant-ui-8.0.0 → adjutant-ui-9.0.0}/adjutant_ui/content/project_users/panel.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 import horizon
 

{adjutant-ui-8.0.0 → adjutant-ui-9.0.0}/adjutant_ui/content/project_users/tables.py

@@ -14,8 +14,8 @@
 
 from collections import defaultdict
 
-from django.utils.translation import ugettext_lazy as _
-from django.utils.translation import ungettext_lazy
+from django.utils.translation import gettext_lazy as _
+from django.utils.translation import ngettext_lazy
 
 from horizon import exceptions
 from horizon import tables
@@ -32,7 +32,7 @@ class InviteUser(tables.LinkAction):
 
     @staticmethod
     def action_past(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             u"Invited User",
             u"Invited Users",
             count
@@ -44,7 +44,7 @@ class ResendInvitation(tables.BatchAction):
 
     @staticmethod
     def action_present(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             u"Resend Invitation",
             u"Resend Invitations",
             count
@@ -52,7 +52,7 @@ class ResendInvitation(tables.BatchAction):
 
     @staticmethod
     def action_past(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             u"Invitation re-sent",
             u"Invitations re-sent",
             count
@@ -85,7 +85,7 @@ class RevokeUser(tables.DeleteAction):
 
     @staticmethod
     def action_present(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             u"Revoke User",
             u"Revoke Users",
             count
@@ -93,7 +93,7 @@ class RevokeUser(tables.DeleteAction):
 
     @staticmethod
     def action_past(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             u"Revoked User",
             u"Revoked Users",
             count

{adjutant-ui-8.0.0 → adjutant-ui-9.0.0}/adjutant_ui/content/project_users/urls.py

@@ -12,15 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from django.conf.urls import url
+from django.urls import re_path
 
 from adjutant_ui.content.project_users import views
 
 
 urlpatterns = [
-    url(r'^invite/$', views.InviteUserView.as_view(), name='invite'),
-    url(r'^(?P<user_id>[^/]+)/update/$',
-        views.UpdateUserView.as_view(),
-        name='update'),
-    url(r'^$', views.UsersView.as_view(), name='index')
+    re_path(r'^invite/$', views.InviteUserView.as_view(), name='invite'),
+    re_path(r'^(?P<user_id>[^/]+)/update/$',
+            views.UpdateUserView.as_view(),
+            name='update'),
+    re_path(r'^$', views.UsersView.as_view(), name='index')
 ]

{adjutant-ui-8.0.0 → adjutant-ui-9.0.0}/adjutant_ui/content/project_users/views.py

@@ -14,7 +14,7 @@
 
 from django.urls import reverse
 from django.urls import reverse_lazy
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from horizon import exceptions
 from horizon import forms

{adjutant-ui-8.0.0 → adjutant-ui-9.0.0}/adjutant_ui/content/quota/forms.py

@@ -15,7 +15,7 @@
 import logging
 
 from django.urls import reverse  # noqa
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from horizon import exceptions
 from horizon import forms

{adjutant-ui-8.0.0 → adjutant-ui-9.0.0}/adjutant_ui/content/quota/panel.py

@@ -12,7 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 import horizon
 

{adjutant-ui-8.0.0 → adjutant-ui-9.0.0}/adjutant_ui/content/quota/tables.py

@@ -14,8 +14,8 @@
 
 import json
 
-from django.utils.translation import ugettext_lazy as _
-from django.utils.translation import ungettext_lazy
+from django.utils.translation import gettext_lazy as _
+from django.utils.translation import ngettext_lazy
 
 from horizon import exceptions
 from horizon import tables
@@ -61,7 +61,7 @@ class CancelQuotaTask(tables.DeleteAction):
 
     @staticmethod
     def action_present(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             u"Cancel Quota Update",
             u"Cancel Quota Updates",
             count
@@ -69,7 +69,7 @@ class CancelQuotaTask(tables.DeleteAction):
 
     @staticmethod
     def action_past(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             u"Cancelled Quota Update",
             u"Cancelled Quota Updates",
             count

{adjutant-ui-8.0.0 → adjutant-ui-9.0.0}/adjutant_ui/content/quota/templates/quota/region_detail.html

@@ -1,6 +1,6 @@
 {% extends 'base.html' %}
 {% load i18n %}
-{% block title %} {% trans "Quota Details" %} {% endblock %}
+{% block title %}{% blocktrans %}{{ region }} Quota Details{% endblocktrans %}{% endblock %}
 
 {% block main %}
   {{ table.render }}

adjutant-ui-9.0.0/adjutant_ui/content/quota/templates/quota/size_detail.html

@@ -0,0 +1,7 @@
+{% extends 'base.html' %}
+{% load i18n %}
+{% block title %}{% blocktrans %}{{ size_titlecase }} Quota Details{% endblocktrans %}{% endblock %}
+
+{% block main %}
+  {{ table.render }}
+{% endblock %}

{adjutant-ui-8.0.0 → adjutant-ui-9.0.0}/adjutant_ui/content/quota/urls.py

@@ -12,17 +12,17 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from django.conf.urls import url
+from django.urls import re_path
 
 from adjutant_ui.content.quota import views
 
 
 urlpatterns = [
-    url(r'^$', views.IndexView.as_view(), name='index'),
-    url(r'^region/(?P<region>[^/]+)$', views.RegionDetailView.as_view(),
-        name='region_detail'),
-    url(r'^(?P<region>[^/]+)/update$',
-        views.RegionUpdateView.as_view(), name='update'),
-    url(r'^size/(?P<size>[^/]+)$', views.QuotaSizeView.as_view(),
-        name='size_detail'),
+    re_path(r'^$', views.IndexView.as_view(), name='index'),
+    re_path(r'^region/(?P<region>[^/]+)$', views.RegionDetailView.as_view(),
+            name='region_detail'),
+    re_path(r'^(?P<region>[^/]+)/update$',
+            views.RegionUpdateView.as_view(), name='update'),
+    re_path(r'^size/(?P<size>[^/]+)$', views.QuotaSizeView.as_view(),
+            name='size_detail'),
 ]

{adjutant-ui-8.0.0 → adjutant-ui-9.0.0}/adjutant_ui/content/quota/views.py

@@ -14,7 +14,7 @@
 
 from django.urls import reverse
 from django.urls import reverse_lazy
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from horizon import exceptions
 from horizon import forms
@@ -57,7 +57,7 @@ class IndexView(horizon_tables.MultiTableView):
 class RegionDetailView(horizon_tables.DataTableView):
     table_class = quota_tables.RegionQuotaDetailTable
     template_name = 'management/quota/region_detail.html'
-    page_title = _("'{{ region }}' Quota Details")
+    page_title = _("{{ region }} Quota Details")
 
     def get_data(self):
         try:
@@ -76,7 +76,7 @@ class RegionDetailView(horizon_tables.DataTableView):
 class QuotaSizeView(horizon_tables.DataTableView):
     table_class = quota_tables.QuotaDetailUsageTable
     template_name = 'management/quota/size_detail.html'
-    page_title = _("'{{ size }}' Quota Details")
+    page_title = _("{{ size | title }} Quota Details")
 
     def get_data(self):
         try:
@@ -89,8 +89,10 @@ class QuotaSizeView(horizon_tables.DataTableView):
     def get_context_data(self, **kwargs):
         # request.user.services_region
         context = super(QuotaSizeView, self).get_context_data(**kwargs)
-        context['title'] = _("%s - Quota Details") \
-            % self.kwargs['size'].title()
+        context['size'] = self.kwargs['size']
+        # NOTE(callumdickinson): Necessary because the title filter
+        # is overloaded in the title block.
+        context['size_titlecase'] = self.kwargs['size'].title()
         return context
 
 

{adjutant-ui-8.0.0 → adjutant-ui-9.0.0}/adjutant_ui/content/signup/forms.py

@@ -15,7 +15,7 @@
 from django.conf import settings
 from django import forms
 from django import http
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from horizon import forms as hforms
 from horizon.utils import functions as utils

{adjutant-ui-8.0.0 → adjutant-ui-9.0.0}/adjutant_ui/content/signup/panel.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 import horizon
 

{adjutant-ui-8.0.0 → adjutant-ui-9.0.0}/adjutant_ui/content/signup/urls.py

@@ -12,11 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from django.conf.urls import url
+from django.urls import re_path
 
 from adjutant_ui.content.signup import views
 
 urlpatterns = [
-    url(r'^$', views.SignupFormView.as_view(), name='index'),
-    url(r'^submitted/?$', views.signup_sent_view, name='submitted'),
+    re_path(r'^$', views.SignupFormView.as_view(), name='index'),
+    re_path(r'^submitted/?$', views.signup_sent_view, name='submitted'),
 ]

{adjutant-ui-8.0.0 → adjutant-ui-9.0.0}/adjutant_ui/content/tasks/forms.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from horizon import forms
 from horizon import messages

{adjutant-ui-8.0.0 → adjutant-ui-9.0.0}/adjutant_ui/content/tasks/panel.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 import horizon