Merge branch 'develop' into develop-2.6

This commit is contained in:
Jeremy Stretch
2019-03-11 21:01:18 -04:00
103 changed files with 308 additions and 213 deletions

View File

@@ -49,7 +49,7 @@ class ClusterTypeTable(BaseTable):
cluster_count = tables.Column(verbose_name='Clusters')
actions = tables.TemplateColumn(
template_code=CLUSTERTYPE_ACTIONS,
attrs={'td': {'class': 'text-right'}},
attrs={'td': {'class': 'text-right noprint'}},
verbose_name=''
)
@@ -68,7 +68,7 @@ class ClusterGroupTable(BaseTable):
cluster_count = tables.Column(verbose_name='Clusters')
actions = tables.TemplateColumn(
template_code=CLUSTERGROUP_ACTIONS,
attrs={'td': {'class': 'text-right'}},
attrs={'td': {'class': 'text-right noprint'}},
verbose_name=''
)