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

- Updates Segment model to return ASC sorted results

Browse Source 
- Updates Subscriber listing to display segmnets with count
This commit is contained in:
Vlad
2016-05-10 18:37:37 -04:00
parent 751d8e7852
commit c3368d69fd
3 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
assets/js/src/subscribers/list.jsx
View File

@ -106,6 +106,9 @@ const bulk_actions = [
return !!(
!segment.deleted_at && segment.type === 'default'
);
},
getLabel: function (segment) {
return segment.name + ' (' + segment.subscribers + ')';
}
};
@ -137,6 +140,9 @@ const bulk_actions = [
return !!(
!segment.deleted_at && segment.type === 'default'
);
},
getLabel: function (segment) {
return segment.name + ' (' + segment.subscribers + ')';
}
};
@ -168,6 +174,9 @@ const bulk_actions = [
return !!(
segment.type === 'default'
);
},
getLabel: function (segment) {
return segment.name + ' (' + segment.subscribers + ')';
}
};

2
lib/Config/Menu.php
View File

@ -325,7 +325,7 @@ class Menu {
? (int)$listing_per_page
: Listing\Handler::DEFAULT_LIMIT_PER_PAGE;
$data['segments'] = Segment::findArray();
$data['segments'] = Segment::getSegmentsWithSubscriberCount();
$data['custom_fields'] = array_map(function($field) {
$field['params'] = unserialize($field['params']);

13
lib/Models/Segment.php
View File

@ -126,18 +126,19 @@ class Segment extends Model {
static function getSegmentsWithSubscriberCount() {
return self::selectMany(array(self::$_table.'.id', self::$_table.'.name'))
->select_expr(
'COUNT('.MP_SUBSCRIBER_SEGMENT_TABLE.'.subscriber_id)', 'subscribers'
->selectExpr(
self::$_table.'.*, COUNT('.MP_SUBSCRIBER_SEGMENT_TABLE.'.subscriber_id) `subscribers`'
)
->left_outer_join(
->leftOuterJoin(
MP_SUBSCRIBER_SEGMENT_TABLE,
array(self::$_table.'.id', '=', MP_SUBSCRIBER_SEGMENT_TABLE.'.segment_id'))
->left_outer_join(
->leftOuterJoin(
MP_SUBSCRIBERS_TABLE,
array(MP_SUBSCRIBER_SEGMENT_TABLE.'.subscriber_id', '=', MP_SUBSCRIBERS_TABLE.'.id'))
->whereNull(MP_SUBSCRIBERS_TABLE.'.deleted_at')
->group_by(self::$_table.'.id')
->group_by(self::$_table.'.name')
->groupBy(self::$_table.'.id')
->groupBy(self::$_table.'.name')
->orderByAsc(self::$_table.'.name')
->where(self::$_table.'.type', 'default')
->whereNull(self::$_table.'.deleted_at')
->findArray();