Hide non default segments on some pages

- added getPublic() method on Segment model
- filter out dynamic lists from add/move/remove segment in subscribers
This commit is contained in:
Jonathan Labreuille
2015-11-26 11:32:10 +01:00
parent a5d96f1534
commit 20e2e03982
3 changed files with 18 additions and 5 deletions

View File

@@ -103,7 +103,9 @@ const bulk_actions = [
id: 'move_to_segment', id: 'move_to_segment',
endpoint: 'segments', endpoint: 'segments',
filter: function(segment) { filter: function(segment) {
return !!(!segment.deleted_at); return !!(
!segment.deleted_at && segment.type === 'default'
);
} }
}; };
@@ -132,7 +134,9 @@ const bulk_actions = [
id: 'add_to_segment', id: 'add_to_segment',
endpoint: 'segments', endpoint: 'segments',
filter: function(segment) { filter: function(segment) {
return !!(!segment.deleted_at); return !!(
!segment.deleted_at && segment.type === 'default'
);
} }
}; };
@@ -159,7 +163,12 @@ const bulk_actions = [
onSelect: function() { onSelect: function() {
let field = { let field = {
id: 'remove_from_segment', id: 'remove_from_segment',
endpoint: 'segments' endpoint: 'segments',
filter: function(segment) {
return !!(
segment.type === 'default'
);
}
}; };
return ( return (

View File

@@ -206,7 +206,7 @@ class Menu {
$data = array( $data = array(
'settings' => $settings, 'settings' => $settings,
'segments' => Segment::getPublished()->findArray(), 'segments' => Segment::getPublic()->findArray(),
'pages' => Pages::getAll(), 'pages' => Pages::getAll(),
'flags' => $this->_getFlags(), 'flags' => $this->_getFlags(),
'charsets' => Charsets::getAll(), 'charsets' => Charsets::getAll(),
@@ -309,7 +309,7 @@ class Menu {
$data = array( $data = array(
'form' => $form, 'form' => $form,
'pages' => Pages::getAll(), 'pages' => Pages::getAll(),
'segments' => Segment::getPublished()->findArray(), 'segments' => Segment::getPublic()->findArray(),
'styles' => FormRenderer::getStyles($form), 'styles' => FormRenderer::getStyles($form),
'date_types' => Block\Date::getDateTypes(), 'date_types' => Block\Date::getDateTypes(),
'date_formats' => Block\Date::getDateFormats() 'date_formats' => Block\Date::getDateFormats()

View File

@@ -173,4 +173,8 @@ class Segment extends Model {
$segment->save(); $segment->save();
return $segment; return $segment;
} }
static function getPublic() {
return self::getPublished()->where('type', 'default');
}
} }