Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@npotier
npotier committed Mar 22, 2015
2 parents fce3369 + 23c9278 commit 5cdfedf
Show file tree
Hide file tree
Showing 18 changed files with 392 additions and 34 deletions.
9 changes: 8 additions & 1 deletion .travis.yml
View file
Expand Up @@ -2,7 +2,13 @@ language: php

php:
- 5.3
- 5.4
- 5.5
- 7.0

matrix:
allow_failures:
- php: 7.0

env:
- SYMFONY_VERSION=origin/master
Expand All @@ -11,7 +17,8 @@ before_script:
- curl -s http://getcomposer.org/installer | php
- php composer.phar install

script: phpunit
script:
- phpunit

notifications:
email:
Expand Down
31 changes: 30 additions & 1 deletion Grid/Column/Column.php
View file
Expand Up @@ -37,6 +37,11 @@ abstract class Column
const OPERATOR_NLIKE = 'nlike';
const OPERATOR_RLIKE = 'rlike';
const OPERATOR_LLIKE = 'llike';
const OPERATOR_SLIKE = 'slike'; //simple/strict LIKE
const OPERATOR_NSLIKE = 'nslike';
const OPERATOR_RSLIKE = 'rslike';
const OPERATOR_LSLIKE = 'lslike';

const OPERATOR_ISNULL = 'isNull';
const OPERATOR_ISNOTNULL = 'isNotNull';

Expand Down Expand Up @@ -91,6 +96,7 @@ abstract class Column
protected $class;
protected $isManualField;
protected $isAggregate;
protected $usePrefixTitle;

protected $dataJunction = self::DATA_CONJUNCTION;

Expand Down Expand Up @@ -128,7 +134,8 @@ public function __initialize(array $params)
$this->setOperatorsVisible($this->getParam('operatorsVisible', true));
$this->setIsManualField($this->getParam('isManualField', false));
$this->setIsAggregate($this->getParam('isAggregate', false));

$this->setUsePrefixTitle($this->getParam('usePrefixTitle', true));

// Order is important for the order display
$this->setOperators($this->getParam('operators', array(
self::OPERATOR_EQ,
Expand All @@ -143,6 +150,10 @@ public function __initialize(array $params)
self::OPERATOR_NLIKE,
self::OPERATOR_RLIKE,
self::OPERATOR_LLIKE,
self::OPERATOR_SLIKE,
self::OPERATOR_NSLIKE,
self::OPERATOR_RSLIKE,
self::OPERATOR_LSLIKE,
self::OPERATOR_ISNULL,
self::OPERATOR_ISNOTNULL,
)));
Expand Down Expand Up @@ -611,12 +622,16 @@ public function getFilters($source)
case self::OPERATOR_LIKE:
case self::OPERATOR_RLIKE:
case self::OPERATOR_LLIKE:
case self::OPERATOR_SLIKE:
case self::OPERATOR_RSLIKE:
case self::OPERATOR_LSLIKE:
if ($this->getSelectMulti()) {
$this->setDataJunction(self::DATA_DISJUNCTION);
}
case self::OPERATOR_EQ:
case self::OPERATOR_NEQ:
case self::OPERATOR_NLIKE:
case self::OPERATOR_NSLIKE:
foreach ((array) $this->data['from'] as $value) {
$filters[] = new Filter($this->data['operator'], $value);
}
Expand Down Expand Up @@ -898,4 +913,18 @@ public function getIsAggregate()
{
return $this->isAggregate;
}

public function getUsePrefixTitle()
{
return $this->usePrefixTitle;
}

public function setUsePrefixTitle($usePrefixTitle)
{
$this->usePrefixTitle = $usePrefixTitle;
return $this;
}



}
92 changes: 92 additions & 0 deletions Grid/Grid.php
View file
Expand Up @@ -267,6 +267,12 @@ class Grid
* @var string
*/
protected $defaultTweak;

/**
* Filters in session
* @var array
*/
protected $sessionFilters;

// Lazy parameters
protected $lazyAddColumn = array();
Expand Down Expand Up @@ -2002,4 +2008,90 @@ public function getRawData($columnNames = null, $namedIndexes = true)

return $result;
}

/**
* Returns an array of the active filters of the grid stored in session
*
* @return Filter[]
* @throws \Exception
*/
public function getFilters()
{
if ($this->hash === null) {
throw new \Exception('getFilters method is only available in the manipulate callback function or after the call of the method isRedirected of the grid.');
}

if ($this->sessionFilters === null) {
$this->sessionFilters = array();
$session = $this->sessionData;

$requestQueries = array(
self::REQUEST_QUERY_MASS_ACTION_ALL_KEYS_SELECTED,
self::REQUEST_QUERY_MASS_ACTION,
self::REQUEST_QUERY_EXPORT,
self::REQUEST_QUERY_PAGE,
self::REQUEST_QUERY_LIMIT,
self::REQUEST_QUERY_ORDER,
self::REQUEST_QUERY_TEMPLATE,
self::REQUEST_QUERY_RESET
);

foreach ($requestQueries as $request_query) {
unset($session[$request_query]);
}

foreach ($session as $columnId => $sessionFilter) {
if (isset($sessionFilter['operator'])) {
$operator = $sessionFilter['operator'];
unset($sessionFilter['operator']);
} else {
$operator = $this->getColumn($columnId)->getDefaultOperator();
}

if (! isset($sessionFilter['to'])) {
$sessionFilter = $sessionFilter['from'];
}

$this->sessionFilters[$columnId] = new Filter($operator, $sessionFilter);
}
}

return $this->sessionFilters;
}

/**
* Returns the filter of a column stored in session
*
* @param string $columnId
* Id of the column
* @return Filter
* @throws \Exception
*/
public function getFilter($columnId)
{
if ($this->hash === null) {
throw new \Exception('getFilters method is only available in the manipulate callback function or after the call of the method isRedirected of the grid.');
}

$sessionFilters = $this->getFilters();

return isset($sessionFilters[$columnId]) ? $sessionFilters[$columnId] : null;
}

/**
* A filter of the column is stored in session ?
*
* @param string $columnId
* Id of the column
* @return boolean
* @throws \Exception
*/
public function hasFilter($columnId)
{
if ($this->hash === null) {
throw new \Exception('hasFilters method is only available in the manipulate callback function or after the call of the method isRedirected of the grid.');
}

return getFilter($columnId) !== null;
}
}
24 changes: 23 additions & 1 deletion Grid/Source/Document.php
View file
Expand Up @@ -100,6 +100,10 @@ protected function normalizeOperator($operator)
case Column::OPERATOR_NLIKE:
case Column::OPERATOR_RLIKE:
case Column::OPERATOR_LLIKE:
case Column::OPERATOR_SLIKE:
case Column::OPERATOR_NSLIKE:
case Column::OPERATOR_RSLIKE:
case Column::OPERATOR_LSLIKE:
case Column::OPERATOR_NEQ:
return 'equals';
case Column::OPERATOR_ISNULL:
Expand All @@ -125,6 +129,14 @@ protected function normalizeValue($operator, $value)
return new \MongoRegex('/^'.$value.'/i');
case Column::OPERATOR_LLIKE:
return new \MongoRegex('/'.$value.'$/i');
case Column::OPERATOR_SLIKE:
return new \MongoRegex('/'.$value.'/');
case Column::OPERATOR_SLIKE:
return new \MongoRegex('/^((?!'.$value.').)*$/');
case Column::OPERATOR_RSLIKE:
return new \MongoRegex('/^'.$value.'/');
case Column::OPERATOR_LSLIKE:
return new \MongoRegex('/'.$value.'$/');
case Column::OPERATOR_ISNULL:
return false;
case Column::OPERATOR_ISNOTNULL:
Expand Down Expand Up @@ -249,6 +261,7 @@ public function getFieldsMetadata($class, $group = 'default')

if (isset($mapping['fieldName'])) {
$values['field'] = $mapping['fieldName'];
$values['id'] = $mapping['fieldName'];
}

if (isset($mapping['id']) && $mapping['id'] == 'id') {
Expand Down Expand Up @@ -281,6 +294,15 @@ public function getFieldsMetadata($class, $group = 'default')
case 'timestamp':
$values['type'] = 'date';
break;
case 'collection':
$values['type'] = 'array';
break;
case 'one':
$values['type'] = 'array';
break;
case 'many':
$values['type'] = 'array';
break;
default:
$values['type'] = 'text';
}
Expand Down Expand Up @@ -310,7 +332,7 @@ public function populateSelectFilters($columns, $loop = false)
// For negative operators, show all values
if ($selectFrom === 'query') {
foreach ($column->getFilters('document') as $filter) {
if (in_array($filter->getOperator(), array(Column::OPERATOR_NEQ, Column::OPERATOR_NLIKE))) {
if (in_array($filter->getOperator(), array(Column::OPERATOR_NEQ, Column::OPERATOR_NLIKE,Column::OPERATOR_NSLIKE))) {
$selectFrom = 'source';
break;
}
Expand Down
23 changes: 19 additions & 4 deletions Grid/Source/Entity.php
View file
Expand Up @@ -254,7 +254,11 @@ protected function normalizeOperator($operator)
case Column::OPERATOR_LLIKE:
case Column::OPERATOR_RLIKE:
case Column::OPERATOR_NLIKE:
return 'like';
case Column::OPERATOR_SLIKE:
case Column::OPERATOR_LSLIKE:
case Column::OPERATOR_RSLIKE:
case Column::OPERATOR_NSLIKE:
return 'like';
default:
return $operator;
}
Expand All @@ -266,10 +270,14 @@ protected function normalizeValue($operator, $value)
//case Column::OPERATOR_REGEXP:
case Column::OPERATOR_LIKE:
case Column::OPERATOR_NLIKE:
case Column::OPERATOR_SLIKE:
case Column::OPERATOR_NSLIKE:
return "%$value%";
case Column::OPERATOR_LLIKE:
case Column::OPERATOR_LSLIKE:
return "%$value";
case Column::OPERATOR_RLIKE:
case Column::OPERATOR_RSLIKE:
return "$value%";
default:
return $value;
Expand Down Expand Up @@ -363,9 +371,16 @@ public function execute($columns, $page = 0, $limit = 0, $maxResults = null, $gr

$columnForFilter = ($column->getType() !== 'join') ? $column : $columnsById[$filter->getColumnName()];

$q = $this->query->expr()->$operator($this->getFieldName($columnForFilter, false), "?$bindIndex");
$fieldName = $this->getFieldName($columnForFilter, false);
$bindIndexPlaceholder = "?$bindIndex";
if( in_array($filter->getOperator(), array(Column::OPERATOR_LIKE,Column::OPERATOR_RLIKE,Column::OPERATOR_LLIKE,Column::OPERATOR_NLIKE,))){
$fieldName = "LOWER($fieldName)";
$bindIndexPlaceholder = "LOWER($bindIndexPlaceholder)";
}

$q = $this->query->expr()->$operator($fieldName, $bindIndexPlaceholder);

if ($filter->getOperator() == Column::OPERATOR_NLIKE) {
if ($filter->getOperator() == Column::OPERATOR_NLIKE || $filter->getOperator() == Column::OPERATOR_NSLIKE) {
$q = $this->query->expr()->not($q);
}

Expand Down Expand Up @@ -595,7 +610,7 @@ public function populateSelectFilters($columns, $loop = false)
// For negative operators, show all values
if ($selectFrom === 'query') {
foreach ($column->getFilters('entity') as $filter) {
if (in_array($filter->getOperator(), array(Column::OPERATOR_NEQ, Column::OPERATOR_NLIKE))) {
if (in_array($filter->getOperator(), array(Column::OPERATOR_NEQ, Column::OPERATOR_NLIKE,Column::OPERATOR_NSLIKE))) {
$selectFrom = 'source';
break;
}
Expand Down
18 changes: 17 additions & 1 deletion Grid/Source/Source.php
View file
Expand Up @@ -288,6 +288,18 @@ public function executeFromData($columns, $page = 0, $limit = 0, $maxResults = n
case Column\Column::OPERATOR_RLIKE:
$value = '/^'.preg_quote($value, '/').'/i';
break;
case Column\Column::OPERATOR_SLIKE:
$value = '/'.preg_quote($value, '/').'/';
break;
case Column\Column::OPERATOR_NSLIKE:
$value = '/^((?!'.preg_quote($value, '/').').)*$/';
break;
case Column\Column::OPERATOR_LSLIKE:
$value = '/'.preg_quote($value, '/').'$/';
break;
case Column\Column::OPERATOR_RSLIKE:
$value = '/^'.preg_quote($value, '/').'/';
break;
}
}

Expand All @@ -307,6 +319,10 @@ public function executeFromData($columns, $page = 0, $limit = 0, $maxResults = n
case Column\Column::OPERATOR_NLIKE:
case Column\Column::OPERATOR_LLIKE:
case Column\Column::OPERATOR_RLIKE:
case Column\Column::OPERATOR_SLIKE:
case Column\Column::OPERATOR_NSLIKE:
case Column\Column::OPERATOR_LSLIKE:
case Column\Column::OPERATOR_RSLIKE:
$fieldValue = $this->prepareStringForLikeCompare($fieldValue, $column->getType());

$found = preg_match($value, $fieldValue);
Expand Down Expand Up @@ -455,7 +471,7 @@ public function populateSelectFiltersFromData($columns, $loop = false)
// For negative operators, show all values
if ($selectFrom === 'query') {
foreach ($column->getFilters('vector') as $filter) {
if (in_array($filter->getOperator(), array(Column\Column::OPERATOR_NEQ, Column\Column::OPERATOR_NLIKE))) {
if (in_array($filter->getOperator(), array(Column\Column::OPERATOR_NEQ, Column\Column::OPERATOR_NLIKE,Column\Column::OPERATOR_NSLIKE))) {
$selectFrom = 'source';
break;
}
Expand Down
2 changes: 1 addition & 1 deletion Resources/doc/columns_configuration/annotations/column_annotation_property.md
View file
Expand Up @@ -64,7 +64,7 @@ class Product
|values|array|_none_||For select filters or replace values in the grid|
|searchOnClick|boolean|false|true or false|Sets the possibility to perform a search on the clicked cell (filterable has to be true)|
|safe|string or false|html|false<br />or<br />see [Escape filters](http://twig.sensiolabs.org/doc/filters/escape.html)|Sets the escape filter|

|usePrefixTitle|boolean|true|true or false|Use the prefixTitle of the grid to render title|
**Note 1**: Every attribute has a setter and a getter method.
**Note 2**: With the `values` attributes, if `type1` is found, the grid displays the value `Type 1`.
**Note 3**: If operators are not visible, filtering is performed with the default operator.
Expand Down
4 changes: 3 additions & 1 deletion Resources/doc/columns_configuration/filters/create_filter.md
View file
Expand Up @@ -4,6 +4,8 @@ Create a filter
If you want another filter than the input and the select filters you can create your own filter.
You just have to create your template for your filter and call it in the `filter` attribute of a column.

**Note**: The name of your filter is converted to lowercase.

## Example with another input filter:

#### Create the template
Expand Down Expand Up @@ -56,4 +58,4 @@ $grid->setSource($source);

$grid->getColumn('description')->setFilterType('input2');
...
```
```

0 comments on commit 5cdfedf

Please sign in to comment.