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

Follow up fix datepicker #3901

Merged
merged 5 commits into from
May 24, 2018
Merged

Follow up fix datepicker #3901

merged 5 commits into from
May 24, 2018

Conversation

gberaudo
Copy link
Member

@gberaudo gberaudo commented May 23, 2018

See #3899.

With this PR, the datepicker selection is:

  • is preset with the previous week;
  • not limited anymore to the previous week.

@@ -227,12 +227,12 @@ exports.RuleController_ = class {
* @export
*/
this.timeRangeMode = {
widget: /** @type {ngeox.TimePropertyWidgetEnum} */ ('datepicker'),
maxValue: this.createDate_(),
minValue: this.createWeekAgoDate_(),
Copy link
Member

Choose a reason for hiding this comment

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

For me it should be used as def values ...

@@ -424,24 +424,21 @@ exports.RuleController_ = class {
this.unlisteners_.push(this.scope_.$watch(
() => this.clone.getExpression(),
(newVal) => {
const value = newVal === null ? this.createDate_() : newVal;
this.timeValueMode.minValue = value;
this.timeValueMode.minValue = newVal;
Copy link
Member

Choose a reason for hiding this comment

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

For that is this code for?

Copy link
Member Author

Choose a reason for hiding this comment

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

Not idea.
But since we now handle the null value correctly I suppose the ternary operation can be removed.

@gberaudo gberaudo force-pushed the follow_up_fix_datepicker_GSGMF-462 branch from 68a120f to eb9460d Compare May 23, 2018 07:52
greenkeeper bot and others added 2 commits May 23, 2018 09:26
@sbrunner sbrunner added this to the 2.3 milestone May 23, 2018
@gberaudo gberaudo force-pushed the follow_up_fix_datepicker_GSGMF-462 branch from eb9460d to 6f98e0c Compare May 23, 2018 12:14
@gberaudo gberaudo changed the title [WIP] Follow up fix datepicker Follow up fix datepicker May 23, 2018
@gberaudo gberaudo changed the base branch from master to 2.3 May 23, 2018 12:16
@gberaudo gberaudo force-pushed the follow_up_fix_datepicker_GSGMF-462 branch from 6f98e0c to 69352e9 Compare May 23, 2018 14:46
@gberaudo
Copy link
Member Author

@sbrunner I fixed the issue with Travis.

@gberaudo gberaudo merged commit bdadc8c into 2.3 May 24, 2018
@gberaudo gberaudo deleted the follow_up_fix_datepicker_GSGMF-462 branch May 24, 2018 08:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants