b2dd9ded59
This reverts commit ed586a0355.
The quota_class subcommand in python-novaclient was used to set default
quota values so it shouldn't have been removed. As now it is being
restored, the defaults quota panel is being restored too.
Related mailing list thread on the topic:
http://lists.openstack.org/pipermail/openstack-dev/2014-May/035383.html
Resolved merge conflicts by hand in:
openstack_dashboard/api/cinder.py
openstack_dashboard/dashboards/admin/info/tabs.py
openstack_dashboard/dashboards/admin/info/tests.py
Updated translatable segments to match refactors in
openstack_dashboard/dashboards/admin/defaults/workflows.py
openstack_dashboard/dashboards/admin/defaults/tables.py
Fixed most egregious post-merge styling errors in
openstack_dashboard/dashboards/admin/defaults/templates/defaults/index.html
(probably should have been separate, but I just couldn't let it out that way!)
Removed unrelated file that was allowed to be part of the original commit
doc/source/topics/settings.rst
Co-Authored-By: Doug Fish <drfish@us.ibm.com>
Change-Id: Ic4c4ecec843c7ea9afd0db36ce0eb15952da15b3
Partial-Bug: #1299517
45 lines
1.4 KiB
Python
45 lines
1.4 KiB
Python
# Copyright 2013 Kylin, 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.usage import quotas
|
|
|
|
from openstack_dashboard.dashboards.admin.defaults import tables
|
|
|
|
|
|
class DefaultQuotasTab(tabs.TableTab):
|
|
table_classes = (tables.QuotasTable,)
|
|
name = _("Default Quotas")
|
|
slug = "quotas"
|
|
template_name = ("horizon/common/_detail_table.html")
|
|
|
|
def get_quotas_data(self):
|
|
request = self.tab_group.request
|
|
try:
|
|
data = quotas.get_default_quota_data(request)
|
|
except Exception:
|
|
data = []
|
|
exceptions.handle(self.request, _('Unable to get quota info.'))
|
|
return data
|
|
|
|
|
|
class DefaultsTabs(tabs.TabGroup):
|
|
slug = "defaults"
|
|
tabs = (DefaultQuotasTab,)
|
|
sticky = True
|