TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nameColumn -> nameFrom

This commit is contained in:
Sam Georges 2014-09-17 18:41:38 +10:00
parent 109df00340
commit 3b2b858b65
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/backend/classes/FilterScope.php
View File

@ -24,12 +24,12 @@ class FilterScope
/**
* @var string Column to display for the display name
*/
public $nameColumn = 'name';
public $nameFrom = 'name';
/**
* @var string Column to display for the description (optional)
*/
public $descriptionColumn;
public $descriptionFrom;
/**
* @var string Filter scope label.
@ -119,8 +119,10 @@ class FilterScope
if (isset($config['conditions'])) $this->conditions = $config['conditions'];
if (isset($config['scope'])) $this->scope = $config['scope'];
if (isset($config['cssClass'])) $this->cssClass = $config['cssClass'];
if (isset($config['nameColumn'])) $this->nameColumn = $config['nameColumn'];
if (isset($config['descriptionColumn'])) $this->descriptionColumn = $config['descriptionColumn'];
if (isset($config['nameFrom'])) $this->nameFrom = $config['nameFrom'];
if (isset($config['descriptionFrom'])) $this->descriptionFrom = $config['descriptionFrom'];
/* @todo Remove line if year >= 2015 */ if (isset($config['nameColumn'])) $this->nameFrom = $config['nameColumn'];
if (array_key_exists('disabled', $config)) $this->disabled = $config['disabled'];
return $config;

2
modules/backend/widgets/Filter.php
View File

@ -414,7 +414,7 @@ class Filter extends WidgetBase
if (is_string($scope))
$scope = $this->getScope($scope);
return $scope->nameColumn;
return $scope->nameFrom;
}
/**