[4.0] fix Templates : Edit style - unsaved menu assignments by shim-sao · Pull Request #30183 · joomla/joomla-cms

shim-sao · 2020-07-24T16:15:31Z

Steps to reproduce the issue

Save a template style with menu assignments (4.0-beta-3-dev)

Expected result

Template style saved with menu assignments

Actual result

None of the menu assignments are saved

System information (as much as possible)

Joomla 4.0-beta-3-dev - Linux - PHP 7.4.8 - MySql 5.7.28

Additional comments

In the Administrator StyleModel.php function Save, replace in the 2 queries :

->whereIn($db->quoteName('checked_out'), [null, $userId])

by something like :

->where($db->quoteName('checked_out') .' IS NULL OR ' . $db->quoteName('checked_out') . ' = :userid')

->bind(':userid', $userid, ParameterType::INTEGER)

I think maybe there is something wrong in the query with whereIn php null and the mysql check IS NULL

= NULL or IN (NULL) may not work sometimes

->where($db->quoteName('checked_out') . '= NULL') => not work

->whereIn($db->quoteName('checked_out'), [null]) => not work

shim-sao

#30182

alikon · 2020-07-24T16:37:32Z

@shim-sao did you close this by mistake ?

shim-sao · 2020-07-24T16:46:07Z

It is my first PR with fork. I don't really know how it work :(

alikon · 2020-07-24T16:50:21Z

no problem at all , all of us have started this way... 😃

but please write

Testing Instructions
Actual result BEFORE applying this Pull Request
Expected result AFTER applying this Pull Request

shim-sao · 2020-07-24T17:34:56Z

It is attached to an issues but I don't know where doing this.

administrator/components/com_templates/src/Model/StyleModel.php

Co-authored-by: SharkyKZ <sharkykz@gmail.com>

richard67 · 2020-07-26T12:57:23Z

I have tested this item ✅ successfully on 26d4f96

1. Code-review: The change is correct.
2. Real test: Successful, i.e. without that patch, the menu assignments are not saved, and with the patch they are saved.

_{This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/30183.}

richard67 · 2020-07-26T12:58:33Z

@SharkyKZ If you have a bit time, could you test, too? Thanks in advance.

alikon · 2020-07-26T16:20:56Z

I have tested this item ✅ successfully on 26d4f96

_{This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/30183.}

alikon · 2020-07-26T16:21:47Z

rtc

_{This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/30183.}

infograf768 · 2020-07-26T16:56:40Z

Do we still have a cs?
We have
->where('(' . $db->quoteName('checked_out') .' IS NULL OR ' . $db->quoteName('checked_out') . ' = :userid)')
Should not we have
->where('(' . $db->quoteName('checked_out') . ' IS NULL OR ' . $db->quoteName('checked_out') . ' = :userid)')

i.e. a space missing between the period and the singlequote?

administrator/components/com_templates/src/Model/StyleModel.php

richard67 · 2020-07-26T17:08:10Z

Back to pending. @shim-sao please apply the suggested changes to fix PHP code style.

@infograf768 You are right. No idea though why the PHPCS check by drone didn't find it.

_{This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/30183.}

Co-authored-by: Richard Fath <richard67@users.noreply.github.com>

richard67 · 2020-07-27T09:44:38Z

I have tested this item ✅ successfully on 39e1640

_{This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/30183.}

richard67 · 2020-07-27T09:45:53Z

Changes after last 2 successful tests were only code style, so these tests are still valid => RTC.

_{This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/30183.}

Quy · 2020-07-27T15:03:16Z

Thanks

…0183) * [4.0] fix Templates : Edit style - unsaved menu assignments * Correct variable $userId not $userid in save function * Update administrator/components/com_templates/src/Model/StyleModel.php Co-authored-by: SharkyKZ <sharkykz@gmail.com> * Update administrator/components/com_templates/src/Model/StyleModel.php Co-authored-by: SharkyKZ <sharkykz@gmail.com> * Update administrator/components/com_templates/src/Model/StyleModel.php Co-authored-by: Richard Fath <richard67@users.noreply.github.com> * Update administrator/components/com_templates/src/Model/StyleModel.php Co-authored-by: Richard Fath <richard67@users.noreply.github.com> Co-authored-by: SharkyKZ <sharkykz@gmail.com> Co-authored-by: Richard Fath <richard67@users.noreply.github.com>

[4.0] fix Templates : Edit style - unsaved menu assignments

79d8f8e

joomla-cms-bot added the PR-4.0-dev label Jul 24, 2020

shim-sao closed this Jul 24, 2020

shim-sao commented Jul 24, 2020

View reviewed changes

Quy reopened this Jul 24, 2020

Quy mentioned this pull request Jul 24, 2020

[4.0] Templates : Edit style - unsaved menu assignments #30182

Closed

Correct variable $userId not $userid in save function

fd343f3

SharkyKZ reviewed Jul 24, 2020

View reviewed changes

administrator/components/com_templates/src/Model/StyleModel.php Outdated Show resolved Hide resolved

SharkyKZ reviewed Jul 24, 2020

View reviewed changes

administrator/components/com_templates/src/Model/StyleModel.php Outdated Show resolved Hide resolved

shim-sao and others added 2 commits July 25, 2020 05:28

Update administrator/components/com_templates/src/Model/StyleModel.php

26d4f96

Co-authored-by: SharkyKZ <sharkykz@gmail.com>

Update administrator/components/com_templates/src/Model/StyleModel.php

713409d

Co-authored-by: SharkyKZ <sharkykz@gmail.com>

joomla-cms-bot added the RTC This Pull Request is Ready To Commit label Jul 26, 2020

richard67 requested changes Jul 26, 2020

View reviewed changes

administrator/components/com_templates/src/Model/StyleModel.php Outdated Show resolved Hide resolved

administrator/components/com_templates/src/Model/StyleModel.php Outdated Show resolved Hide resolved

richard67 removed the RTC This Pull Request is Ready To Commit label Jul 26, 2020

shim-sao and others added 2 commits July 27, 2020 11:33

Update administrator/components/com_templates/src/Model/StyleModel.php

81e30b6

Co-authored-by: Richard Fath <richard67@users.noreply.github.com>

Update administrator/components/com_templates/src/Model/StyleModel.php

39e1640

Co-authored-by: Richard Fath <richard67@users.noreply.github.com>

joomla-cms-bot added the RTC This Pull Request is Ready To Commit label Jul 27, 2020

richard67 approved these changes Jul 27, 2020

View reviewed changes

Quy added this to the Joomla 4.0 milestone Jul 27, 2020

Quy merged commit 64e83ef into joomla:4.0-dev Jul 27, 2020

joomla-cms-bot removed the RTC This Pull Request is Ready To Commit label Jul 27, 2020

Uh oh!

Conversation

shim-sao commented Jul 24, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Steps to reproduce the issue

Expected result

Actual result

System information (as much as possible)

Additional comments

Uh oh!

shim-sao left a comment

Choose a reason for hiding this comment

Uh oh!

alikon commented Jul 24, 2020

Uh oh!

shim-sao commented Jul 24, 2020

Uh oh!

alikon commented Jul 24, 2020

Uh oh!

shim-sao commented Jul 24, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

richard67 commented Jul 26, 2020

Uh oh!

richard67 commented Jul 26, 2020

Uh oh!

alikon commented Jul 26, 2020

Uh oh!

alikon commented Jul 26, 2020

Uh oh!

infograf768 commented Jul 26, 2020

Uh oh!

Uh oh!

Uh oh!

richard67 commented Jul 26, 2020

Uh oh!

richard67 commented Jul 27, 2020

Uh oh!

richard67 commented Jul 27, 2020

Uh oh!

Quy commented Jul 27, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

shim-sao commented Jul 24, 2020 •

edited

Loading

shim-sao commented Jul 24, 2020 •

edited

Loading