openstack/deb-horizon
Code Issues Proposed changes

Merge "Do not try to show L3 agent action when enable_router is False" into stable/ocata

Browse Source
This commit is contained in:
Jenkins 2017-03-17 03:33:06 +00:00 committed by Gerrit Code Review
commit 3ee8fdae2c
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openstack_dashboard/dashboards/admin/info/tables.py
View File

@ -10,6 +10,7 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.conf import settings
from django.core import urlresolvers
from django import template
from django.template import defaultfilters as filters
@ -179,6 +180,9 @@ class NetworkL3AgentRoutersLinkAction(tables.LinkAction):
verbose_name = _("View Routers")
def allowed(self, request, datum):
network_config = getattr(settings, 'OPENSTACK_NEUTRON_NETWORK', {})
if not network_config.get('enable_router', True):
return False
# Determine whether this action is allowed for the current request.
return datum.agent_type == "L3 agent"