Cavemanon/piratepoet
8
Fork 0
Code Pull Requests Actions Releases 16 Activity

fixed total count and filtering + basic tab implementation in React

Browse Source
This commit is contained in:
Jonathan Labreuille
2016-06-02 16:59:23 +02:00
parent 86a2846215
commit c959e7ec96
6 changed files with 57 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Models/Newsletter.php
View File

@@ -162,13 +162,13 @@ class Newsletter extends Model {
return $filters;
}
static function filterBy($orm, $filters = null) {
if(!empty($filters)) {
foreach($filters as $key => $value) {
static function filterBy($orm, $data = array()) {
if(!empty($data['filter'])) {
foreach($data['filter'] as $key => $value) {
if($key === 'segment') {
$segment = Segment::findOne($value);
if($segment !== false) {
$orm = $segment->newsletters();
$orm = $segment->newsletters()->where('type', $data['tab']);
}
}
}
@@ -215,7 +215,7 @@ class Newsletter extends Model {
static function listingQuery($data = array()) {
return self::where('type', $data['tab'])
->filter('filterBy', $data['filter'])
->filter('filterBy', $data)
->filter('groupBy', $data['group'])
->filter('search', $data['search']);
}