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.

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

Jump to bottom

Display NOK PrestaShop requirements #9407

Merged
merged 6 commits into from
Aug 22, 2018
Merged

Display NOK PrestaShop requirements #9407

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bdd7bb4
Display NOK PrestaShop requirements
Quetzacoalt91 Aug 6, 2018
a371d67
Move default message in Requirements check class
Quetzacoalt91 Aug 15, 2018
1fae515
Add missing descriptions
Quetzacoalt91 Aug 15, 2018
cc6488d
Add missing slash in theme folder
Quetzacoalt91 Aug 15, 2018
ec59d2a
Update wrong domain 'Install'
Quetzacoalt91 Aug 17, 2018
2232521
Update wording of requirements
Quetzacoalt91 Aug 22, 2018
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
16 changes: 12 additions & 4 deletions ...hopBundle/Resources/views/Admin/Configure/AdvancedParameters/system_information.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,8 +196,12 @@
</p>
<ul>
{% for key, value in requirements.testsRequired %}
{% if 'fail' == value and key in requirements.testsErrors|keys %}
<li>{{ requirements.testsErrors[key] }}</li>
{% if 'fail' == value %}
{% if key in requirements.testsErrors|keys %}
<li>{{ requirements.testsErrors[key] }}</li>
{% else %}
<li>{{ '%key% (missing description)'|trans({'%key%': key}, 'Admin.Advparameters.Notification') }}</li>
Copy link
Contributor

Choose a reason for hiding this comment

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

Must be in Admin.Advparameters.Feature.

Copy link
Contributor

Choose a reason for hiding this comment

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

I'm not sure we should patch this in the template, but ensure the key is in requirements.testsError array, don't you think?

{% endif %}
{% endif %}
{% endfor %}
</ul>
Expand All @@ -213,8 +217,12 @@
</p>
<ul>
{% for key, value in requirements.testsOptional %}
{% if 'fail' == value and testsErrors[key] is defined %}
<li>{{ requirements.testsErrors[key] }}</li>
{% if 'fail' == value %}
{% if testsErrors[key] is defined %}
<li>{{ requirements.testsErrors[key] }}</li>
{% else %}
<li>{{ '%key% (missing description)'|trans({'%key%': key}, 'Admin.Advparameters.Notification') }}</li>
Copy link
Contributor

Choose a reason for hiding this comment

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

Must be in Admin.Advparameters.Feature.

Copy link
Contributor

@mickaelandrieu mickaelandrieu Aug 6, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

Wy? it's a notification :( (answering to @LouiseBonnard)

Copy link
Contributor

@LouiseBonnard LouiseBonnard Aug 6, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

Because we classify the basic content of a page in the Feature file.

{% endif %}
{% endif %}
{% endfor %}
</ul>
Expand Down