Fix extend_retires_on method for number of days. #14143
Merged
Conversation
This file contains 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
|
@miq-bot add_label bug, euwe/yes |
psachin
pushed a commit
to psachin/manageiq-content
that referenced
this pull request
Mar 3, 2017
The retires_on field was changed from a `:date` column to a `:datetime` which now requires the days(in seconds) be added to the time. - Depends on: ManageIQ/manageiq#14143 - This issue was introduced in PR ManageIQ/manageiq#11156 - https://bugzilla.redhat.com/show_bug.cgi?id=1427503 Signed-off-by: Sachin <psachin@redhat.com>
tinaafitz
force-pushed
the
retire_extends_on_fix
branch
from
813bb73
to
938ae55
Compare
tinaafitz
changed the title
|
@mkanoor Please review. |
mkanoor
reviewed
Mar 7, 2017
| @@ -51,7 +51,7 @@ def retires_on=(timestamp) | |||
|
|
|||
| def extend_retires_on(days, date = Time.zone.today) | |||
There was a problem hiding this comment.
@tinaafitz
Should the default value also be Time.zone.now
mkanoor
reviewed
Mar 7, 2017
| @@ -51,7 +51,7 @@ def retires_on=(timestamp) | |||
|
|
|||
| def extend_retires_on(days, date = Time.zone.today) | |||
| _log.info "Extending Retirement Date on #{self.class.name} id:<#{self.id}>, name:<#{self.name}> " | |||
| new_retires_date = date + days.to_i | |||
| new_retires_date = date + days.to_i.days | |||
There was a problem hiding this comment.
@tinaafitz
What is the date object coming into this function, would it have the time embedded in it? Since days returns a Duration object its possible that the time component could produce different results based on the timezone.
tinaafitz
force-pushed
the
retire_extends_on_fix
branch
from
938ae55
to
72e364f
Compare
|
@mkanoor Please take another look. |
tinaafitz
force-pushed
the
retire_extends_on_fix
branch
from
72e364f
to
6da714c
Compare
|
@mkanoor Added date validation. |
mkanoor
reviewed
Mar 10, 2017
| @@ -199,7 +199,7 @@ def invoke_ae | |||
| :retirement_last_warn => Time.zone.today, | |||
| :retirement_state => "retiring" | |||
| ) | |||
| service_service.retires_on = Time.zone.today + 1 | |||
| service_service.retires_on = Time.zone.today + 1.day | |||
There was a problem hiding this comment.
@tinaafitz
Should this be Time.zone.now?
tinaafitz
force-pushed
the
retire_extends_on_fix
branch
from
6da714c
to
8359630
Compare
|
Checked commits tinaafitz/manageiq@ddb9238~...8359630 with ruby 2.2.6, rubocop 0.47.1, and haml-lint 0.20.0 |
|
@mkanoor Thanks for catching that. |
simaishi
pushed a commit
that referenced
this pull request
Mar 20, 2017
Fix extend_retires_on method for number of days. (cherry picked from commit f20cab8) https://bugzilla.redhat.com/show_bug.cgi?id=1433980
|
Euwe backport details: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The retires_on field was changed from a :date column to a :datetime
Issue brought to our attention by:
ManageIQ/manageiq-content#62
Prefer to use the model method extend_retires_on in Automate methods.
https://bugzilla.redhat.com/show_bug.cgi?id=1427503