Skip to content

Commit 3a2b6f2

Browse files
authored
Merge pull request #515 from dtaylor113/fix-513
pfTableView: Truly turn off pagination by default
2 parents 4c55581 + ab6b1e5 commit 3a2b6f2

File tree

2 files changed

+29
-0
lines changed

2 files changed

+29
-0
lines changed

src/table/tableview/examples/table-view-basic.js

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,30 @@
235235
city: "New York",
236236
state: "New York"
237237
},
238+
{
239+
name: "Mike Bird",
240+
address: "50 Forth Street",
241+
city: "New York",
242+
state: "New York"
243+
},
244+
{
245+
name: "Cheryl Taylor",
246+
address: "2 Main Street",
247+
city: "New York",
248+
state: "New York"
249+
},
250+
{
251+
name: "Ren DiLorenzo",
252+
address: "10 Chase Lane",
253+
city: "Boston",
254+
state: "Massacusetts"
255+
},
256+
{
257+
name: "Kim Livingston",
258+
address: "5 Tree Hill Lane",
259+
city: "Boston",
260+
state: "Massacusetts"
261+
}
238262
];
239263
resolve(items);
240264
}, 10);

src/table/tableview/table-view.component.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ angular.module('patternfly.table').component('pfTableView', {
2525
destroy: true,
2626
order: [[1, "asc"]],
2727
dom: "t",
28+
paging: false,
2829
select: {
2930
selector: 'td:first-child input[type="checkbox"]',
3031
style: 'multi'
@@ -46,9 +47,13 @@ angular.module('patternfly.table').component('pfTableView', {
4647
if (angular.isDefined(ctrl.colummns) && angular.isUndefined(ctrl.columns)) {
4748
ctrl.columns = ctrl.colummns;
4849
}
50+
4951
if (angular.isUndefined(ctrl.dtOptions)) {
5052
ctrl.dtOptions = {};
53+
} else if (angular.isDefined(ctrl.dtOptions.paginationType)) {
54+
ctrl.dtOptions.paging = true;
5155
}
56+
5257
if (angular.isUndefined(ctrl.config)) {
5358
ctrl.config = {};
5459
}

0 commit comments

Comments
 (0)