Skip to content

[4.0] Admin modules: Cannot select or filter by position #23289

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wilsonge merged 12 commits into from
Jan 4, 2019
Merged

[4.0] Admin modules: Cannot select or filter by position #23289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
d4c3b58
[4.0] Admin modules: Cannot select or filter by position
infograf768 Dec 16, 2018
b305794
oops
infograf768 Dec 17, 2018
9afd992
Setting input in models instead of layouts
infograf768 Dec 17, 2018
0660899
oops2
infograf768 Dec 17, 2018
cc8f54b
int
infograf768 Dec 18, 2018
b61de66
Using getUserState
infograf768 Dec 18, 2018
dadbd90
Merge branch '4.0-dev' into 4-0.admin_modules_position
infograf768 Dec 18, 2018
c4d5e9e
Merge branch '4.0-dev' into 4-0.admin_modules_position
infograf768 Dec 19, 2018
b3d2774
Merge branch '4.0-dev' into 4-0.admin_modules_position
infograf768 Dec 31, 2018
250c36a
Merge branch '4.0-dev' into 4-0.admin_modules_position
infograf768 Jan 3, 2019
76b957b
Merge branch '4.0-dev' into 4-0.admin_modules_position
infograf768 Jan 4, 2019
bee2307
Merge branch '4.0-dev' into 4-0.admin_modules_position
wilsonge Jan 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion administrator/components/com_modules/Field/ModulesModuleField.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class ModulesModuleField extends \JFormFieldList
*/
public function getOptions()
{
$clientId = Factory::getApplication()->input->get('client_id', 0, 'int');
$clientId = Factory::getApplication()->getUserState('com_modules.modules.client_id', 0);
$options = ModulesHelper::getModules($clientId);

return array_merge(parent::getOptions(), $options);
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_modules/Field/ModulesPositionField.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class ModulesPositionField extends ListField
*/
public function getOptions()
{
$clientId = Factory::getApplication()->input->get('client_id', 0, 'int');
$clientId = Factory::getApplication()->getUserState('com_modules.modules.client_id', 0);
$options = ModulesHelper::getPositions($clientId);

return array_merge(parent::getOptions(), $options);
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_modules/Field/ModulesPositioneditField.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ protected function getInput()
{
$data = $this->getLayoutData();

$clientId = Factory::getApplication()->input->get('client_id', 0, 'int');
$clientId = Factory::getApplication()->getUserState('com_modules.modules.client_id', 0);
$positions = HTMLHelper::_('modules.positions', $clientId, 1, $this->value);

$data['client'] = $clientId;
Expand Down
4 changes: 2 additions & 2 deletions administrator/components/com_modules/forms/moduleadmin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<form>
<fieldset>
<fieldset addfieldprefix="Joomla\Component\Modules\Administrator\Field">
<field
name="id"
type="number"
Expand Down Expand Up @@ -90,7 +90,7 @@

<field
name="position"
type="moduleposition"
type="ModulesPositionedit"
label="COM_MODULES_FIELD_POSITION_LABEL"
default=""
maxlength="50"
Expand Down