Skip to content
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

Combination feature desactivation #6208

Merged
merged 3 commits into from
Sep 7, 2016
Merged

Combination feature desactivation #6208

merged 3 commits into from
Sep 7, 2016

Conversation

aleeks
Copy link
Contributor

@aleeks aleeks commented Sep 7, 2016

Questions Answers
Branch? develop
Description? Fix "attributes & features" tabs display & toolbar
Fix "combination" bloc on "new product" page
Type? bug fix
Category? BO
BC breaks? no
Deprecations? no
Fixed ticket? http://forge.prestashop.com/browse/BOOM-1227
How to test? - With a correct install (no corrupted product/combination), change combination & feature settings (BO > performance),
- Go to "attributes & features tabs", test if is ok with settings,
- Go on "new product" page and see "declinaison bloc" on the right is active or not

* Return if Feature feature is active or not
* @return bool
*/
public function featureIsActive()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Except if I'm wrong, it's not used, right ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, it's not used for the moment. As I was working on combinaison and feature, I make 2 functions

@vincentbz
Copy link
Contributor

Tested and ok, thanks !

No combination possible when option is disabled
image

The attribute page is disabled too
image

@prestonBot prestonBot added the QA ✔️ Status: check done, code approved label Sep 7, 2016
@mickaelandrieu mickaelandrieu added the Waiting for author Status: action required, waiting for author feedback label Sep 7, 2016
'desc' => $this->trans('Add new feature', array(), 'Admin.Catalog.Feature'),
'icon' => 'process-icon-new'
);
if (Feature::isFeatureActive()) {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's not really the same :

  • sometimes $this->display == 'something', sometimes empty($this->display)
  • Combination:: vs Feature::

@mickaelandrieu mickaelandrieu removed the Waiting for author Status: action required, waiting for author feedback label Sep 7, 2016
@mickaelandrieu mickaelandrieu merged commit 62e8b06 into PrestaShop:develop Sep 7, 2016
@mickaelandrieu
Copy link
Contributor

Thank you @aleeks

@aleeks aleeks deleted the combination_feature_desactivation branch September 7, 2016 16:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
QA ✔️ Status: check done, code approved
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants