diff --git a/CHANGELOG.md b/CHANGELOG.md index a199e475d..2c84c838f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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']`. diff --git a/modules/backend/behaviors/RelationController.php b/modules/backend/behaviors/RelationController.php index db9279aea..3bbdf9191 100644 --- a/modules/backend/behaviors/RelationController.php +++ b/modules/backend/behaviors/RelationController.php @@ -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); } /* diff --git a/modules/backend/widgets/Lists.php b/modules/backend/widgets/Lists.php index 59347ecb3..5fcb9f69d 100644 --- a/modules/backend/widgets/Lists.php +++ b/modules/backend/widgets/Lists.php @@ -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;