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

Display error message correctly that is returned from model. #1115

Merged
merged 2 commits into from Apr 24, 2017

Conversation

h-kataria
Copy link
Contributor

@h-kataria h-kataria commented Apr 21, 2017

Display correct flash message when there is an error deleting Catalog Item

https://bugzilla.redhat.com/show_bug.cgi?id=1443120

ci_delete_after

@syncrou please review/test

Display correct flash message when there is an error deleting Catalog Item

https://bugzilla.redhat.com/show_bug.cgi?id=1443120
{:record => ui_lookup(:table => "service_template")}) if @flash_array.nil?
self.x_node = "root"
if @flash_array.nil?
add_flash(_("The selected %{record} was deleted") %
Copy link
Contributor

Choose a reason for hiding this comment

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

I know this has been there before, but for the sake of translators and nicer translations, we'd like
to get rid of calling ui_lookup() on a static string. So I'd suggest to change the above string to:
"The selected Catalog Item was deleted"

@h-kataria
Copy link
Contributor Author

@mzazrivec addressed feedback.

@miq-bot
Copy link
Member

miq-bot commented Apr 24, 2017

Checked commits h-kataria/manageiq-ui-classic@78451fe~...caccd80 with ruby 2.2.6, rubocop 0.47.1, and haml-lint 0.20.0
1 file checked, 0 offenses detected
Everything looks good. 🏆

@syncrou
Copy link
Contributor

syncrou commented Apr 24, 2017

👍 LGTM - once green

@dclarizio dclarizio self-assigned this Apr 24, 2017
@dclarizio
Copy link

JS errors are unrelated to this PR as there are no JS changes, merging.

@dclarizio dclarizio merged commit a0d684c into ManageIQ:master Apr 24, 2017
@dclarizio dclarizio added this to the Sprint 59 Ending Apr 24, 2017 milestone Apr 24, 2017
simaishi pushed a commit that referenced this pull request Apr 25, 2017
Display error message correctly that is returned from model.
(cherry picked from commit a0d684c)

https://bugzilla.redhat.com/show_bug.cgi?id=1445108
@simaishi
Copy link
Contributor

Fine backport details:

$ git log -1
commit d2b711c55b90e267457ab1e7caf739eeffa2b36d
Author: Dan Clarizio <dclarizi@redhat.com>
Date:   Mon Apr 24 15:26:37 2017 -0700

    Merge pull request #1115 from h-kataria/catalog_item_delete_fix
    
    Display error message correctly that is returned from model.
    (cherry picked from commit a0d684c30748a7c8b29a91b06948b2fa695d2362)
    
    https://bugzilla.redhat.com/show_bug.cgi?id=1445108

@h-kataria h-kataria deleted the catalog_item_delete_fix branch April 27, 2017 19:51
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.

None yet

6 participants