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

Refacto ThemeCatalogController to use annotations #12077

Merged
merged 1 commit into from Jan 21, 2019

Conversation

Projects
None yet
6 participants
@matks
Copy link
Contributor

matks commented Jan 8, 2019

Questions Answers
Branch? develop
Description? Refactor Controller to use latest conventions about annotations
Type? improvement
Category? BO
BC breaks? no
Deprecations? no
Fixed ticket?
How to test? Page "Improve > Design > Themes Catalog" should behave like before, especially access rules. This Controller controls themes shown by Addons.

This change is Reviewable

@matks matks force-pushed the matks:refacto-ThemeCatalogController branch from 5684b15 to 1dc6918 Jan 8, 2019

@mbadrani

This comment has been minimized.

Copy link
Contributor

mbadrani commented Jan 17, 2019

@matks Fatal error 500 on your PR in import page
image

@mbadrani

This comment has been minimized.

Copy link
Contributor

mbadrani commented Jan 17, 2019

@matks need rebase to fix the import page (error 500)

@Quetzacoalt91

This comment has been minimized.

Copy link
Member

Quetzacoalt91 commented Jan 17, 2019

FYI a rebase is only needed when we need to retrieve the latest changes before reapplying the new commits (in case of conflicts or when we need to use another base branch).

When new changes must be brought, this task is not needed.

@mbadrani

This comment has been minimized.

Copy link
Contributor

mbadrani commented Jan 18, 2019

Mathieu need to rebase @Quetzacoalt91 if you want more context please ask @matks

@Quetzacoalt91

This comment has been minimized.

Copy link
Member

Quetzacoalt91 commented Jan 18, 2019

Actually YOU will need to rebase as soon as the other fix is merged, in order to get the latest changes.

@ntiepresta ntiepresta removed their assignment Jan 18, 2019

@ntiepresta ntiepresta added QA ✔️ and removed waiting for QA labels Jan 18, 2019

@Quetzacoalt91 Quetzacoalt91 merged commit 3f60919 into PrestaShop:develop Jan 21, 2019

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

@Quetzacoalt91 Quetzacoalt91 added this to the 1.7.6.0 milestone Jan 21, 2019

@Quetzacoalt91

This comment has been minimized.

Copy link
Member

Quetzacoalt91 commented Jan 21, 2019

Thank you @matks

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