Do not use generic object fileicon if no picture specified #4040
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_reviewer @epwinchell |
|
Checked commit skateman@0a9c31e with ruby 2.3.3, rubocop 0.52.1, haml-lint 0.20.0, and yamllint 1.10.0 |
epwinchell
reviewed
Jun 4, 2018
| @@ -4,6 +4,6 @@ def self.fonticon | |||
| end | |||
|
|
|||
| def fileicon | |||
| try(:picture) ? "/pictures/#{picture.basename}" : "100/generic_object.png" | |||
| try(:picture) ? "/pictures/#{picture.basename}" : nil | |||
There was a problem hiding this comment.
@skateman What about ff-generic-object ?
There was a problem hiding this comment.
@epwinchell that's being used, see above. But if the picture is defined, it overrides the fonticon.
|
@skateman I approve |
|
@himdel @mzazrivec merge? |
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.
We want to prefer fonticons if possible, and the
generic_object.pngis something we want to get rid of.Parent issue: #4051