1935a3d8d2
Quotas fail to load on the project quota update form in the admin dashboard when the volume service is disabled. Change the get_default_quota_data and get_tenant_quota_data functions to always check for a disabled volume service, so we don't have to remember to do it every time we call the functions. Moved *QUOTA_FIELDS to usage/quotas.py to avoid a circular import. Fixes bug #1155878. Change-Id: I7150c4d7c318b6199ff03825cf5d770c7741b379
64 lines
2.0 KiB
Python
64 lines
2.0 KiB
Python
# vim: tabstop=4 shiftwidth=4 softtabstop=4
|
|
|
|
# Copyright 2012 Nebula, Inc.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
from django.utils.translation import ugettext_lazy as _
|
|
|
|
from horizon import exceptions
|
|
from horizon import tabs
|
|
|
|
from openstack_dashboard.api import keystone
|
|
from openstack_dashboard.usage import quotas
|
|
from .tables import QuotasTable, ServicesTable
|
|
from openstack_dashboard.api.base import is_service_enabled
|
|
|
|
|
|
class DefaultQuotasTab(tabs.TableTab):
|
|
table_classes = (QuotasTable,)
|
|
name = _("Default Quotas")
|
|
slug = "quotas"
|
|
template_name = ("horizon/common/_detail_table.html")
|
|
|
|
def get_quotas_data(self):
|
|
request = self.tab_group.request
|
|
try:
|
|
quota_set = quotas.get_default_quota_data(request)
|
|
data = quota_set.items
|
|
except:
|
|
data = []
|
|
exceptions.handle(self.request, _('Unable to get quota info.'))
|
|
return data
|
|
|
|
|
|
class ServicesTab(tabs.TableTab):
|
|
table_classes = (ServicesTable,)
|
|
name = _("Services")
|
|
slug = "services"
|
|
template_name = ("horizon/common/_detail_table.html")
|
|
|
|
def get_services_data(self):
|
|
request = self.tab_group.request
|
|
services = []
|
|
for i, service in enumerate(request.user.service_catalog):
|
|
service['id'] = i
|
|
services.append(keystone.Service(service))
|
|
return services
|
|
|
|
|
|
class SystemInfoTabs(tabs.TabGroup):
|
|
slug = "system_info"
|
|
tabs = (ServicesTab, DefaultQuotasTab,)
|
|
sticky = True
|