Update changelog, move relation config under view/manage array respectively
This commit is contained in:
parent
31447df5d4
commit
2460e54028
|
|
@ -1,5 +1,10 @@
|
||||||
* **Build 14x** (2014-09-xx)
|
* **Build 14x** (2014-09-xx)
|
||||||
|
- Various fixes to the RelationController relating to belongsToMany relations.
|
||||||
|
- Tree Lists are now collapsed by default to better handle large data sets.
|
||||||
|
|
||||||
|
* **Build 141** (2014-09-04)
|
||||||
- Add new `dump()` Twig function (config app.debug must be true).
|
- Add new `dump()` Twig function (config app.debug must be true).
|
||||||
|
- Components can now be expanded in the CMS editor by holding Ctrl/Meta and double clicking the `{% component %}` tag.
|
||||||
|
|
||||||
* **Build 139** (2014-08-30)
|
* **Build 139** (2014-08-30)
|
||||||
- Components and variables can now be accessed in the page code section via `$this->foo` in addition to `$this['foo']`.
|
- Components and variables can now be accessed in the page code section via `$this->foo` in addition to `$this['foo']`.
|
||||||
|
|
|
||||||
|
|
@ -595,8 +595,9 @@ class RelationController extends ControllerBehavior
|
||||||
$config = $this->makeConfig($this->config->list);
|
$config = $this->makeConfig($this->config->list);
|
||||||
$config->model = $this->relationModel;
|
$config->model = $this->relationModel;
|
||||||
$config->alias = $this->alias . 'ViewList';
|
$config->alias = $this->alias . 'ViewList';
|
||||||
$config->showSorting = $this->getConfig('showSorting', true);
|
$config->showSorting = $this->getConfig('view[showSorting]', true);
|
||||||
$config->defaultSort = $this->getConfig('defaultSort');
|
$config->defaultSort = $this->getConfig('view[defaultSort]');
|
||||||
|
$config->recordsPerPage = $this->getConfig('view[recordsPerPage]');
|
||||||
|
|
||||||
if (!$this->readOnly) {
|
if (!$this->readOnly) {
|
||||||
$config->recordOnClick = sprintf("$.oc.relationBehavior.clickManageListRecord(:id, '%s', '%s')", $this->field, $this->relationGetSessionKey());
|
$config->recordOnClick = sprintf("$.oc.relationBehavior.clickManageListRecord(:id, '%s', '%s')", $this->field, $this->relationGetSessionKey());
|
||||||
|
|
@ -656,6 +657,7 @@ class RelationController extends ControllerBehavior
|
||||||
$config->alias = $this->alias . 'ManageList';
|
$config->alias = $this->alias . 'ManageList';
|
||||||
$config->showSetup = false;
|
$config->showSetup = false;
|
||||||
$config->showCheckboxes = true;
|
$config->showCheckboxes = true;
|
||||||
|
$config->recordsPerPage = $this->getConfig('manage[recordsPerPage]');
|
||||||
$widget = $this->makeWidget('Backend\Widgets\Lists', $config);
|
$widget = $this->makeWidget('Backend\Widgets\Lists', $config);
|
||||||
}
|
}
|
||||||
/*
|
/*
|
||||||
|
|
|
||||||
|
|
@ -66,7 +66,7 @@ class Lists extends WidgetBase
|
||||||
public $recordOnClick;
|
public $recordOnClick;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @var int Rows to display for each page.
|
* @var int Maximum rows to display for each page.
|
||||||
*/
|
*/
|
||||||
public $recordsPerPage;
|
public $recordsPerPage;
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue