openstack/horizon
Code Issues Proposed changes

Merge "[TrivialFix] Hide expand in angular table if we haven't setSummaryTemplateUrl"

Browse Source
This commit is contained in:
Jenkins 2016-07-21 09:19:15 +00:00 committed by Gerrit Code Review
commit 7971aea145
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
horizon/static/framework/widgets/table/hz-detail-row.directive.js
View File

@ -84,7 +84,7 @@
function link(scope, element, attrs) { function link(scope, element, attrs) {
var templateUrl = $parse(attrs.templateUrl)(scope); var templateUrl = $parse(attrs.templateUrl)(scope);
if (angular.isUndefined(templateUrl)) { if (!templateUrl) {
templateUrl = basePath + 'table/hz-detail-row.html'; templateUrl = basePath + 'table/hz-detail-row.html';
} }
$http.get(templateUrl, { cache: $templateCache }) $http.get(templateUrl, { cache: $templateCache })

2
horizon/static/framework/widgets/table/hz-resource-table.controller.js
View File

@ -41,7 +41,7 @@
ctrl.config = { ctrl.config = {
detailsTemplateUrl: ctrl.resourceType.summaryTemplateUrl, detailsTemplateUrl: ctrl.resourceType.summaryTemplateUrl,
selectAll: true, selectAll: true,
expand: true, expand: ctrl.resourceType.summaryTemplateUrl,
trackId: ctrl.trackBy || 'id', trackId: ctrl.trackBy || 'id',
columns: ctrl.resourceType.getTableColumns() columns: ctrl.resourceType.getTableColumns()
}; };