Skip to content

Commit cecc4fe

Browse files
committed
sorry @Malou, your filter select breaks pagination in 4.0.
We have implemented filter select using a Sprunje data source in 4.1.
1 parent 9978077 commit cecc4fe

3 files changed

Lines changed: 15 additions & 3 deletions

File tree

app/sprinkles/admin/src/Sprunje/UserSprunje.php

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ class UserSprunje extends Sprunje
2525
protected $sortable = [
2626
'name',
2727
'last_activity',
28-
'flag_enabled'
28+
'flag_enabled',
29+
'status'
2930
];
3031

3132
protected $filterable = [
@@ -127,4 +128,16 @@ protected function sortName($query, $direction)
127128
{
128129
return $query->orderBy('last_name', $direction);
129130
}
131+
132+
/**
133+
* Sort active, unactivated, disabled
134+
*
135+
* @param Builder $query
136+
* @param string $direction
137+
* @return Builder
138+
*/
139+
protected function sortStatus($query, $direction)
140+
{
141+
return $query->orderBy('flag_enabled', $direction)->orderBy('flag_verified', $direction);
142+
}
130143
}

app/sprinkles/admin/templates/components/tables/users.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
{% if 'last_activity' in table.columns %}
1616
<th class="sorter-metanum" data-column-name="last_activity" data-column-template="#user-table-column-last-activity" data-priority="2">{{translate("ACTIVITY.LAST")}} <i class="fa fa-sort"></i></th>
1717
{% endif %}
18-
<th class="filter-select filter-metaselect" data-column-name="flag_enabled" data-column-template="#user-table-column-actions" data-priority="1">{{translate("STATUS")}}/{{translate("ACTIONS")}} <i class="fa fa-sort"></i></th>
18+
<th class="filter-false" data-column-name="status" data-column-template="#user-table-column-actions" data-priority="1">{{translate("STATUS")}}/{{translate("ACTIONS")}} <i class="fa fa-sort"></i></th>
1919
</tr>
2020
</thead>
2121
<tbody>

app/sprinkles/core/assets/local/core/js/uf-table.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,6 @@
317317
});
318318

319319
base.ts.on('pagerComplete', function () {
320-
$el.find('.tablesorter').trigger('update');
321320
$el.trigger('pagerComplete.ufTable');
322321
});
323322
};

0 commit comments

Comments
 (0)