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.

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

Fixed bug in AdminGroupsController when adding ModulesRestrictions to group in multishop configuration #8237

Merged
merged 4 commits into from Sep 20, 2018

Conversation

Projects
None yet
8 participants
@christianverardi
Contributor

christianverardi commented Aug 10, 2017

Questions Answers
Branch? develop
Description? The issue is that when you are in a multishop context and you try to revoke to a user's group the access to a module, Prestashop will save the information for both the shops (even if the ps_module_group is shop dependent).
Type? bug fix
Category? BO
BC breaks? no
Deprecations? no
Fixed ticket?
How to test? Set up a multishop installation, edit one Customer Group for a single shop and disable some modules for that customer group. Then change shop and check that those modules are still enabled for the edited customer group.

This change is Reviewable

@eternoendless

Looks good to me! Only one small change is needed

Show outdated Hide outdated controllers/admin/AdminOrdersController.php Outdated

@eternoendless eternoendless changed the title from BO: Fixed bug in AdminGroupsController when adding ModulesRestriction… to BO: Fixed bug in AdminGroupsController when adding ModulesRestrictions to group in multishop configuration Oct 12, 2017

@eternoendless eternoendless added the Bug label Oct 12, 2017

@eternoendless eternoendless changed the title from BO: Fixed bug in AdminGroupsController when adding ModulesRestrictions to group in multishop configuration to Fixed bug in AdminGroupsController when adding ModulesRestrictions to group in multishop configuration Oct 12, 2017

@eternoendless eternoendless added this to the 1.7.3.1 milestone Oct 12, 2017

@eternoendless eternoendless modified the milestones: 1.7.3.1, 1.7.3.2 Mar 20, 2018

@eternoendless eternoendless modified the milestones: 1.7.3.2, 1.7.4.1 Apr 13, 2018

@eternoendless

This comment has been minimized.

Show comment
Hide comment
@eternoendless

eternoendless Apr 13, 2018

Member

I'd like to push some changes to your PR in order to be able to approve it.

Could you please activate the option "Allow edits from maintainers" on your PR?

You can find it at the bottom of the right column:

image

Thanks!

Member

eternoendless commented Apr 13, 2018

I'd like to push some changes to your PR in order to be able to approve it.

Could you please activate the option "Allow edits from maintainers" on your PR?

You can find it at the bottom of the right column:

image

Thanks!

@christianverardi

This comment has been minimized.

Show comment
Hide comment
@christianverardi
Contributor

christianverardi commented Apr 13, 2018

@eternoendless Done! ;)

@marionf

This comment has been minimized.

Show comment
Hide comment
@marionf

marionf May 7, 2018

Contributor

Hello @christianverardi

You are talking of modules in customers" group ?

capture du 2018-05-07 11-39-41

Contributor

marionf commented May 7, 2018

Hello @christianverardi

You are talking of modules in customers" group ?

capture du 2018-05-07 11-39-41

@christianverardi

This comment has been minimized.

Show comment
Hide comment
@christianverardi

christianverardi May 7, 2018

Contributor

@marionf yes I'm talking about enabled modules for a customer group and a specific shop.
Sorry, I updated the PR's description to be more clear ;)

Contributor

christianverardi commented May 7, 2018

@marionf yes I'm talking about enabled modules for a customer group and a specific shop.
Sorry, I updated the PR's description to be more clear ;)

@marionf

This comment has been minimized.

Show comment
Hide comment
@marionf

marionf May 9, 2018

Contributor

Thank you @christianverardi

Contributor

marionf commented May 9, 2018

Thank you @christianverardi

@marionf marionf added QA ✔️ and removed waiting for author labels May 9, 2018

@mickaelandrieu

This comment has been minimized.

Show comment
Hide comment
@mickaelandrieu

mickaelandrieu Jun 5, 2018

Contributor

Tests are failing; the best you can do here is try to rebase develop branch and hope for the best :)

Contributor

mickaelandrieu commented Jun 5, 2018

Tests are failing; the best you can do here is try to rebase develop branch and hope for the best :)

@mickaelandrieu mickaelandrieu added Invalid and removed Invalid labels Jun 5, 2018

@PierreRambaud

Need rebase for travis

@eternoendless

This comment has been minimized.

Show comment
Hide comment
@eternoendless

eternoendless Aug 17, 2018

Member

Rebased... let's cross fingers now :)

Member

eternoendless commented Aug 17, 2018

Rebased... let's cross fingers now :)

Cristiano Verardi and others added some commits Aug 10, 2017

@eternoendless

This comment has been minimized.

Show comment
Hide comment
@eternoendless

eternoendless Sep 18, 2018

Member

Rebased again

Member

eternoendless commented Sep 18, 2018

Rebased again

@Quetzacoalt91

This comment has been minimized.

Show comment
Hide comment
@Quetzacoalt91

Quetzacoalt91 Sep 20, 2018

Member

Just applied CS fixer to make the tests pass.

Member

Quetzacoalt91 commented Sep 20, 2018

Just applied CS fixer to make the tests pass.

@Quetzacoalt91 Quetzacoalt91 merged commit 7b1f201 into PrestaShop:develop Sep 20, 2018

1 of 2 checks passed

code-review/reviewable 4 files, 1 discussion left (eternoendless)
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@Quetzacoalt91

This comment has been minimized.

Show comment
Hide comment
@Quetzacoalt91
Member

Quetzacoalt91 commented Sep 20, 2018

Thank you @christianverardi

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment