Conversation
malaskowski
suggested changes
Dec 10, 2018
Contributor
malaskowski
left a comment
malaskowski
left a comment
There was a problem hiding this comment.
One cosmetic change before merging to master.
Could you please also update the CHANGELOG and add an instruction in the description of this PR about what is this feature, add the screenshot and instruction on how to enable it.
| @@ -43,8 +43,10 @@ define(['angularAMD'], function (angularAMD) { | |||
| var isChristmas = isDateWithinMargin(TODAY, CHRISTMAS_DATE, DAY_MARGIN); | |||
|
|
|||
| if (isChristmas) { | |||
Contributor
There was a problem hiding this comment.
Could we please add additional flag, e.g. winterEditionEnabled and make the condition:
if (winterEditionEnabled && isChristmas) {
?
It should be set to false by default.
If admin of an AET instance decides to enable it, it should be manually set to true on the server instance.
malaskowski
reviewed
Dec 10, 2018
| var isChristmas = isDateWithinMargin(TODAY, CHRISTMAS_DATE, DAY_MARGIN); | ||
|
|
||
| if (isChristmas) { | ||
| if (isChristmas && winterEditionEnabled) { |
Contributor
There was a problem hiding this comment.
Please revert the order of flags.
Contributor
Author
|
Added description and screenshot to PR. |
malaskowski
approved these changes
Dec 10, 2018
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Updated winter edition with improvements suggested by users.
Description
Now the Winter Theme is disabled by default. To enable it go to
report/src/main/webapp/app/themes/winterEdition.directive.jsand change the value ofwinterEditionEnabledvariable totrue. Winter Theme will be visible 14 days before and after Christmas. Winter Theme contains:Screenshot
Types of changes
Checklist:
I hereby agree to the terms of the AET Contributor License Agreement.