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

Renamed tab to type

Browse Source 
- renamed getExtraParams to getParams
- fixed issue with String.contains by replacing it with indexOf
- removed useless break; statement
This commit is contained in:
Jonathan Labreuille
2016-07-15 12:12:26 +02:00
parent ef0cbb3e9f
commit 3d706414b7
6 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Models/Newsletter.php
View File

@ -219,8 +219,6 @@ class Newsletter extends Model {
->where('queues.newsletter_id', $this->id)
->where('queues.status', SendingQueue::STATUS_COMPLETED)
->findOne();
break;
default:
if($this->queue === false) {
return false;
@ -259,7 +257,7 @@ class Newsletter extends Model {
}
static function filters($data = array()) {
$type = isset($data['params']['tab']) ? $data['params']['tab'] : null;
$type = isset($data['params']['type']) ? $data['params']['type'] : null;
// newsletter types without filters
if(in_array($type, array(
@ -311,7 +309,7 @@ class Newsletter extends Model {
}
// filter by type
$type = isset($data['params']['tab']) ? $data['params']['tab'] : null;
$type = isset($data['params']['type']) ? $data['params']['type'] : null;
if($type !== null) {
$orm->filter('filterType', $type);
}
@ -358,7 +356,7 @@ class Newsletter extends Model {
}
static function groups($data = array()) {
$type = isset($data['params']['tab']) ? $data['params']['tab'] : null;
$type = isset($data['params']['type']) ? $data['params']['type'] : null;
// newsletter types without groups
if(in_array($type, array(