[16.04] Backport of 2613 #2633
Merged
[16.04] Backport of 2613 #2633
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
- Adds a change event for element_count that renders the subtitle - Subtitle now renders the count or nothing if not available Conflicts: static/scripts/bundled/analysis.bundled.js static/scripts/bundled/analysis.bundled.js.map static/scripts/bundled/libs.bundled.js.map
Conflicts: client/galaxy/scripts/mvc/history/history-contents.js static/scripts/bundled/analysis.bundled.js.map static/scripts/bundled/libs.bundled.js.map
Conflicts: static/maps/mvc/history/history-contents.js.map static/scripts/bundled/analysis.bundled.js static/scripts/bundled/analysis.bundled.js.map static/scripts/bundled/libs.bundled.js.map static/scripts/mvc/history/history-contents.js
Conflicts: static/maps/mvc/history/history-contents.js.map static/scripts/bundled/analysis.bundled.js static/scripts/bundled/analysis.bundled.js.map static/scripts/bundled/libs.bundled.js static/scripts/bundled/libs.bundled.js.map static/scripts/bundled/login.bundled.js static/scripts/bundled/login.bundled.js.map static/scripts/mvc/history/history-contents.js
|
Thanks so very much for this @martenson and @carlfeberhard. This fix is needed for the ChIP-exo flavor and I really appreciate both the fix and the back port to 16.04! ;) |
|
👍 |
|
Sure. +1 |
|
Merged locally to resolve conflicts and rebuild client. |
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.
This PR backports #2613
I think we can make a case that this is a bugfix worth porting: We support tools that create reasonable outputs that are never shown in history in spite of being returned by API.
I had some trouble with backporting this as
var subtitleTemplate = BASE_MVC.wrapTemplatedid not exist in 16.04 so I also backported the introduction of it (first two commits here). I would really appreciate if you could have a look at this @carlfeberhard. Thank you.