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

Fix statement in flash message #2764

Merged

Conversation

mzazrivec
Copy link
Contributor

The condition for showing the problematic flash message:

if @edit[:new][:end_date].to_time < @edit[:new][:start_date].to_time

@@ -236,7 +236,7 @@ def cu_repair_field_changed
def cu_repair
return unless load_edit("curepair_edit__new", "replace_cell__explorer")
if @edit[:new][:end_date].to_time < @edit[:new][:start_date].to_time
add_flash(_("End Date cannot be greater than Start Date"), :error)
add_flash(_("End Date cannot be smaller than Start Date"), :error)
Copy link
Member

Choose a reason for hiding this comment

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

Suggest earlier instead of smaller

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed as suggested, thanks.

@mzazrivec mzazrivec force-pushed the fix_flash_message_statement branch from a558401 to 191407c Compare November 21, 2017 09:23
@miq-bot
Copy link
Member

miq-bot commented Nov 21, 2017

Checked commit mzazrivec@191407c with ruby 2.3.3, rubocop 0.47.1, haml-lint 0.20.0, and yamllint 1.10.0
1 file checked, 0 offenses detected
Everything looks fine. 👍

@martinpovolny martinpovolny added this to the Sprint 74 Ending Nov 27, 2017 milestone Nov 22, 2017
@martinpovolny martinpovolny self-assigned this Nov 22, 2017
@martinpovolny martinpovolny merged commit 93fcae5 into ManageIQ:master Nov 22, 2017
simaishi pushed a commit that referenced this pull request Nov 27, 2017
Fix statement in flash message
(cherry picked from commit 93fcae5)
@simaishi
Copy link
Contributor

Gaprindashvili backport details:

$ git log -1
commit 4b0bb269c61d36d0654331af38b33f6cad712f92
Author: Martin Povolny <[email protected]>
Date:   Wed Nov 22 22:18:04 2017 +0100

    Merge pull request #2764 from mzazrivec/fix_flash_message_statement
    
    Fix statement in flash message
    (cherry picked from commit 93fcae56ad46ab3a3d86f41ba37bd582ef8a9017)

@mzazrivec mzazrivec deleted the fix_flash_message_statement branch February 22, 2018 12:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants