opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Swap to a 'nametags' field in the high level view instead of returning all tags. TODO: Optimize this

Browse Source
This commit is contained in:
Dannon Baker
2017-03-03 09:34:16 -05:00
parent 4b7fea8d3f
commit a3ab46ef26
7 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/galaxy/scripts/mvc/history/hda-li.js
+2 -4
View File
@@ -45,10 +45,8 @@ HDAListItemView.prototype.templates = (function(){
'</div>',
'</br>',
'<span class="nametags">',
'<% _.each(dataset.tags, function(tag){ %>',
'<% if (tag.startsWith("name.")){ %>',
'<span class="label label-info"><%- tag.substring(5) %></span>',
'<% } %>',
'<% _.each(dataset.nametags, function(tag){ %>',
'<span class="label label-info"><%- tag %></span>',
'<% }); %>',
'</span>',
'</div>'
lib/galaxy/managers/hdas.py
+16 -2
View File
@@ -261,7 +261,7 @@ class HDASerializer( # datasets._UnflattenedMetadataDatasetAssociationSerialize
'state',
'extension',
'deleted', 'purged', 'visible',
'tags',
'nametags',
'type',
'url',
'create_time',
@@ -286,6 +286,7 @@ class HDASerializer( # datasets._UnflattenedMetadataDatasetAssociationSerialize
'creating_job',
'rerunnable',
'tags',
'uuid',
'permissions',
'file_name',
@@ -331,7 +332,7 @@ class HDASerializer( # datasets._UnflattenedMetadataDatasetAssociationSerialize
'misc_blurb' : self._remap_from( 'blurb' ),
'file_ext' : self._remap_from( 'extension' ),
'file_path' : self._remap_from( 'file_name' ),
'nametags' : self.serialize_nametags,
'resubmitted' : lambda i, k, **c: self.hda_manager.has_been_resubmitted( i ),
'display_apps' : self.serialize_display_apps,
'display_types' : self.serialize_old_display_applications,
@@ -385,6 +386,19 @@ class HDASerializer( # datasets._UnflattenedMetadataDatasetAssociationSerialize
return display_apps
def serialize_nametags( self, hda, key, trans=None, **context ):
"""
Return list of 'name.' child tags attached to this dataset.
TODO: investigate faster ways to fetch children of .name
"""
nametags = []
for tag in hda.tags:
if tag.tag.name.startswith('name.'):
nametags.append(tag.tag.name[5:])
return nametags
return [tag for tag in hda.tags if tag.tag.name.startswith('name.')]
def serialize_old_display_applications( self, hda, key, trans=None, **context ):
"""
Return dictionary containing old-style display app urls.
static/maps/mvc/history/hda-li.js.map
+1 -1
View File
@@ -1 +1 @@
{"version":3,"file":"hda-li.js","sources":["../../../src/mvc/history/hda-li.js"],"names":["define","DATASET_LI","BASE_MVC","_l","_super","DatasetListItemView","HDAListItemView","extend","className","prototype","initialize","attributes","options","call","this","toString","modelString","model","templates","titleBarTemplate","wrapTemplate","warnings","_","hidden","titleBar"],"mappings":"AAAAA,QACI,yBACA,eACA,sBACD,SAAUC,EAAYC,EAAUC,GAEnC,YAGA,IAAIC,GAASH,EAAWI,oBAMpBC,EAAkBF,EAAOG,QAGzBC,UAAcJ,EAAOK,UAAUD,UAAY,mBAE3CE,WAAa,SAAUC,EAAYC,GAC/BR,EAAOK,UAAUC,WAAWG,KAAMC,KAAMH,EAAYC,IAKxDG,SAAW,WACP,GAAIC,GAAgBF,KAAW,MAAIA,KAAKG,MAAQ,GAAK,YACrD,OAAO,mBAAqBD,EAAc,MAgD9C,OA1CJV,GAAgBG,UAAUS,UAAa,WAEnC,GAAIC,GAAmBjB,EAASkB,cAE5B,6CACI,mCACA,sBAEI,+CACA,gDACJ,SACA,QACA,0BACI,4CACI,sCACI,gEACJ,UACJ,YACJ,UACJ,UACD,WAECC,EAAWC,EAAEf,UAAYH,EAAOK,UAAUS,UAAUG,UACpDE,OAASrB,EAASkB,cAEd,gCACI,+CACIjB,EAAI,gCACR,SACJ,WACD,YAGP,OAAOmB,GAAEf,UAAYH,EAAOK,UAAUS,WAClCM,SAAWL,EACXE,SAAWA,QAQXf,gBAAmBA"}
{"version":3,"file":"hda-li.js","sources":["../../../src/mvc/history/hda-li.js"],"names":["define","DATASET_LI","BASE_MVC","_l","_super","DatasetListItemView","HDAListItemView","extend","className","prototype","initialize","attributes","options","call","this","toString","modelString","model","templates","titleBarTemplate","wrapTemplate","warnings","_","hidden","titleBar"],"mappings":"AAAAA,QACI,yBACA,eACA,sBACD,SAAUC,EAAYC,EAAUC,GAEnC,YAGA,IAAIC,GAASH,EAAWI,oBAMpBC,EAAkBF,EAAOG,QAGzBC,UAAcJ,EAAOK,UAAUD,UAAY,mBAE3CE,WAAa,SAAUC,EAAYC,GAC/BR,EAAOK,UAAUC,WAAWG,KAAMC,KAAMH,EAAYC,IAKxDG,SAAW,WACP,GAAIC,GAAgBF,KAAW,MAAIA,KAAKG,MAAQ,GAAK,YACrD,OAAO,mBAAqBD,EAAc,MA8C9C,OAxCJV,GAAgBG,UAAUS,UAAa,WAEnC,GAAIC,GAAmBjB,EAASkB,cAE5B,6CACI,mCACA,sBAEI,+CACA,gDACJ,SACA,QACA,0BACI,gDACI,mDACJ,YACJ,UACJ,UACD,WAECC,EAAWC,EAAEf,UAAYH,EAAOK,UAAUS,UAAUG,UACpDE,OAASrB,EAASkB,cAEd,gCACI,+CACIjB,EAAI,gCACR,SACJ,WACD,YAGP,OAAOmB,GAAEf,UAAYH,EAAOK,UAAUS,WAClCM,SAAWL,EACXE,SAAWA,QAQXf,gBAAmBA"}
static/scripts/bundled/analysis.bundled.js
+4 -4
View File
File diff suppressed because one or more lines are too long
static/scripts/bundled/analysis.bundled.js.map
+1 -1
View File
File diff suppressed because one or more lines are too long
static/scripts/bundled/libs.bundled.js.map
+1 -1
View File
File diff suppressed because one or more lines are too long
static/scripts/mvc/history/hda-li.js
+1 -1
View File
@@ -1,2 +1,2 @@
define(["mvc/dataset/dataset-li","mvc/base-mvc","utils/localization"],function(a,b,c){"use strict";var d=a.DatasetListItemView,e=d.extend({className:d.prototype.className+" history-content",initialize:function(a,b){d.prototype.initialize.call(this,a,b)},toString:function(){var a=this.model?this.model+"":"(no model)";return"HDAListItemView("+a+")"}});return e.prototype.templates=function(){var a=b.wrapTemplate(['<div class="title-bar clear" tabindex="0">','<span class="state-icon"></span>','<div class="title">','<span class="hid"><%- dataset.hid %></span> ','<span class="name"><%- dataset.name %></span>',"</div>","</br>",'<span class="nametags">',"<% _.each(dataset.tags, function(tag){ %>",'<% if (tag.startsWith("name.")){ %>','<span class="label label-info"><%- tag.substring(5) %></span>',"<% } %>","<% }); %>","</span>","</div>"],"dataset"),e=_.extend({},d.prototype.templates.warnings,{hidden:b.wrapTemplate(["<% if( !dataset.visible ){ %>",'<div class="hidden-msg warningmessagesmall">',c("This dataset has been hidden"),"</div>","<% } %>"],"dataset")});return _.extend({},d.prototype.templates,{titleBar:a,warnings:e})}(),{HDAListItemView:e}});
define(["mvc/dataset/dataset-li","mvc/base-mvc","utils/localization"],function(a,b,c){"use strict";var d=a.DatasetListItemView,e=d.extend({className:d.prototype.className+" history-content",initialize:function(a,b){d.prototype.initialize.call(this,a,b)},toString:function(){var a=this.model?this.model+"":"(no model)";return"HDAListItemView("+a+")"}});return e.prototype.templates=function(){var a=b.wrapTemplate(['<div class="title-bar clear" tabindex="0">','<span class="state-icon"></span>','<div class="title">','<span class="hid"><%- dataset.hid %></span> ','<span class="name"><%- dataset.name %></span>',"</div>","</br>",'<span class="nametags">',"<% _.each(dataset.nametags, function(tag){ %>",'<span class="label label-info"><%- tag %></span>',"<% }); %>","</span>","</div>"],"dataset"),e=_.extend({},d.prototype.templates.warnings,{hidden:b.wrapTemplate(["<% if( !dataset.visible ){ %>",'<div class="hidden-msg warningmessagesmall">',c("This dataset has been hidden"),"</div>","<% } %>"],"dataset")});return _.extend({},d.prototype.templates,{titleBar:a,warnings:e})}(),{HDAListItemView:e}});
//# sourceMappingURL=../../../maps/mvc/history/hda-li.js.map