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

Update changelog, move relation config under view/manage array respectively

This commit is contained in:
Sam Georges 2014-09-06 12:09:00 +10:00
parent 31447df5d4
commit 2460e54028
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -1,5 +1,10 @@
* **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).
- Components can now be expanded in the CMS editor by holding Ctrl/Meta and double clicking the `{% component %}` tag.
* **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']`.

6
modules/backend/behaviors/RelationController.php
View File

@ -595,8 +595,9 @@ class RelationController extends ControllerBehavior
$config = $this->makeConfig($this->config->list);
$config->model = $this->relationModel;
$config->alias = $this->alias . 'ViewList';
$config->showSorting = $this->getConfig('showSorting', true);
$config->defaultSort = $this->getConfig('defaultSort');
$config->showSorting = $this->getConfig('view[showSorting]', true);
$config->defaultSort = $this->getConfig('view[defaultSort]');
$config->recordsPerPage = $this->getConfig('view[recordsPerPage]');
if (!$this->readOnly) {
$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->showSetup = false;
$config->showCheckboxes = true;
$config->recordsPerPage = $this->getConfig('manage[recordsPerPage]');
$widget = $this->makeWidget('Backend\Widgets\Lists', $config);
}
/*

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

@ -66,7 +66,7 @@ class Lists extends WidgetBase
public $recordOnClick;
/**
* @var int Rows to display for each page.
* @var int Maximum rows to display for each page.
*/
public $recordsPerPage;