Skip to content

Commit 15a4cee

Browse files
committed
pfToolbar & pfSort: Hide sort dropdown when in Table View
1 parent 7b4e637 commit 15a4cee

File tree

4 files changed

+14
-2
lines changed

4 files changed

+14
-2
lines changed

src/sort/sort-component.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@ angular.module('patternfly.sort').component('pfSort', {
1010
var prevConfig;
1111

1212
ctrl.$onInit = function () {
13+
if (angular.isDefined(ctrl.config) && angular.isUndefined(ctrl.config.show)) {
14+
// default to true
15+
ctrl.config.show = true;
16+
}
17+
1318
angular.extend(ctrl, {
1419
selectField: selectField,
1520
changeDirection: changeDirection,

src/toolbars/examples/toolbar.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,13 +321,15 @@
321321
};
322322
323323
var viewSelected = function(viewId) {
324-
$scope.viewType = viewId
324+
$scope.viewType = viewId;
325+
$scope.sortConfig.show = ($scope.viewType === "tableView" ? false : true);
325326
};
326327
327328
$scope.viewsConfig = {
328329
views: [pfViewUtils.getListView(), pfViewUtils.getCardView(), pfViewUtils.getTableView()],
329330
onViewSelect: viewSelected
330331
};
332+
331333
$scope.viewsConfig.currentView = $scope.viewsConfig.views[0].id;
332334
$scope.viewType = $scope.viewsConfig.currentView;
333335

src/toolbars/toolbar-component.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ angular.module('patternfly.toolbars').component('pfToolbar', {
1313
var prevConfig;
1414

1515
ctrl.$onInit = function () {
16+
if (angular.isDefined(ctrl.config.sortConfig) && angular.isUndefined(ctrl.config.sortConfig.show)) {
17+
// default to true
18+
ctrl.config.sortConfig.show = true;
19+
}
20+
1621
angular.extend(ctrl, {
1722
viewSelected: viewSelected,
1823
isViewSelected: isViewSelected,

src/toolbars/toolbar.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<pf-filter-fields config="$ctrl.config.filterConfig" ng-if="$ctrl.config.filterConfig" add-filter-fn="$ctrl.addFilter"></pf-filter-fields>
77
</div>
88
<div class="form-group">
9-
<pf-sort config="$ctrl.config.sortConfig" ng-if="$ctrl.config.sortConfig"></pf-sort>
9+
<pf-sort config="$ctrl.config.sortConfig" ng-if="$ctrl.config.sortConfig && $ctrl.config.sortConfig.show"></pf-sort>
1010
</div>
1111
<div class="form-group toolbar-actions"
1212
ng-if="$ctrl.config.actionsConfig &&

0 commit comments

Comments
 (0)