Fix quadicons under service catalogs #971
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
skateman
reviewed
Apr 17, 2017
app/helpers/quadicon_helper.rb
Outdated
| @@ -561,8 +560,8 @@ def render_ems_cluster_quadicon(item, options) | |||
| def render_non_listicon_single_quadicon(item, options) | |||
| output = [] | |||
|
|
|||
| img_path = if item.decorate | |||
| item.decorate.try(:fileicon) | |||
| img_path = if item.decorate.try(:fileicon) | |||
There was a problem hiding this comment.
I hate these long lines, but ok :)
|
Aside, from @skateman's comment, this is good to go. |
|
@miq-bot assign @dclarizio |
|
@hayesr let me know when you've addressed the comment above. |
…corate always will be. Also, use `image_tag` instead of `tag(:img)` https://bugzilla.redhat.com/show_bug.cgi?id=1439517
hayesr
force-pushed
the
fix_catalog_quad
branch
from
005b420 to
35b2877
Compare
|
@dclarizio Should be ready when green. |
|
Checked commit hayesr@35b2877 with ruby 2.2.6, rubocop 0.47.1, and haml-lint 0.20.0 |
|
Restart CI |
simaishi
pushed a commit
that referenced
this pull request
Apr 20, 2017
Fix quadicons under service catalogs (cherry picked from commit af4ea85) https://bugzilla.redhat.com/show_bug.cgi?id=1444171
|
Fine 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 change in decorators effects how this quadicon determines which icon to display. This changes the single quadicon to check for the return of
fileiconexplicitly sinceitem.decoratewill usually (always?) be true.Before
After
@epwinchell Can you confirm this is the correct rendering?
Addresses:
https://bugzilla.redhat.com/show_bug.cgi?id=1439517