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

Merge remote-tracking branch 'upstream/release_17.09' into dev

Browse Source
This commit is contained in:
Dannon Baker
2017-10-12 12:43:05 -04:00
parent dfb2cc2f36 ebdadb68ad
commit 7ceaec4a22
14 changed files with 42 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/galaxy/scripts/layout/router.js
+1 -1
View File
@@ -19,7 +19,7 @@ var Router = Backbone.Router.extend({
url += url.indexOf( '?' ) == -1 ? '?' : '&';
url += $.param( data , true );
}
Galaxy.params = {};
Galaxy.params = data;
this.navigate( url, { 'trigger': true } );
},
client/galaxy/scripts/mvc/dataset/dataset-li-edit.js
+20 -5
View File
@@ -49,20 +49,26 @@ var DatasetListItemEdit = _super.extend(
/** Render icon-button to edit the attributes (format, permissions, etc.) this dataset. */
_renderEditButton : function(){
var self = this;
// don't show edit while uploading, in-accessible
// DO show if in error (ala previous history panel)
if( ( this.model.get( 'state' ) === STATES.DISCARDED )
|| ( !this.model.get( 'accessible' ) ) ){
return null;
}
var purged = this.model.get( 'purged' ),
deleted = this.model.get( 'deleted' ),
editBtnData = {
title : _l( 'Edit attributes' ),
href : Galaxy.root + 'datasets/edit?dataset_id=' + this.model.attributes.id,
faIcon : 'fa-pencil',
classes : 'edit-btn'
classes : 'edit-btn',
onclick : function( ev ) {
if ( Galaxy.router ) {
ev.preventDefault();
Galaxy.router.push( 'datasets/edit', { dataset_id : self.model.attributes.id } );
}
}
};
// disable if purged or deleted and explain why in the tooltip
if( deleted || purged ){
@@ -195,11 +201,18 @@ var DatasetListItemEdit = _super.extend(
/** Render icon-button to report an error on this dataset to the galaxy admin. */
_renderErrButton : function(){
var self = this;
return faIconButton({
title : _l( 'View or report this error' ),
href : Galaxy.root + 'datasets/error?dataset_id=' + this.model.attributes.id,
classes : 'report-error-btn',
faIcon : 'fa-bug'
faIcon : 'fa-bug',
onclick : function( ev ) {
if ( Galaxy.router ) {
ev.preventDefault();
Galaxy.router.push( 'datasets/error', { dataset_id : self.model.attributes.id } );
}
}
});
},
@@ -214,8 +227,10 @@ var DatasetListItemEdit = _super.extend(
target : this.linkTarget,
faIcon : 'fa-refresh',
onclick : function( ev ) {
ev.preventDefault();
Galaxy.router.push( '/', { job_id : creating_job } );
if ( Galaxy.router ) {
ev.preventDefault();
Galaxy.router.push( '/', { job_id : creating_job } );
}
}
});
}
client/package-lock.json
Generated
+7 -7
View File
@@ -1175,13 +1175,6 @@
}
}
},
"string_decoder": {
"version": "1.0.1",
"bundled": true,
"requires": {
"safe-buffer": "5.0.1"
}
},
"string-width": {
"version": "1.0.2",
"bundled": true,
@@ -1191,6 +1184,13 @@
"strip-ansi": "3.0.1"
}
},
"string_decoder": {
"version": "1.0.1",
"bundled": true,
"requires": {
"safe-buffer": "5.0.1"
}
},
"stringstream": {
"version": "0.0.5",
"bundled": true,
lib/galaxy/tools/parser/xml.py
+2 -2
View File
@@ -201,7 +201,7 @@ class XmlToolSource(ToolSource):
def parse_provided_metadata_style(self):
style = None
out_elem = self.root.find("outputs")
if out_elem and "provided_metadata_style" in out_elem.attrib:
if out_elem is not None and "provided_metadata_style" in out_elem.attrib:
style = out_elem.attrib["provided_metadata_style"]
if style is None:
@@ -213,7 +213,7 @@ class XmlToolSource(ToolSource):
def parse_provided_metadata_file(self):
provided_metadata_file = "galaxy.json"
out_elem = self.root.find("outputs")
if out_elem and "provided_metadata_file" in out_elem.attrib:
if out_elem is not None and "provided_metadata_file" in out_elem.attrib:
provided_metadata_file = out_elem.attrib["provided_metadata_file"]
return provided_metadata_file
static/maps/layout/router.js.map
+1 -1
View File
@@ -1 +1 @@
{"version":3,"file":"router.js","sources":["../../src/layout/router.js"],"names":["jQuery","require","$","QUERY_STRING","Ui","Router","Backbone","extend","initialize","page","options","this","push","url","data","__identifer","Math","random","toString","substr","isEmptyObject","indexOf","param","Galaxy","params","navigate","trigger","execute","callback","args","name","debug","queryObj","parse","pop","authenticate","apply","access_denied","display","Message","status","message","persistent","module","exports"],"mappings":"AAAA,GAAIA,QAASC,QAAS,UAClBC,EAAIF,OACJG,aAAeF,QAAS,8BACxBG,GAAKH,QAAS,kBAEdI,OAASC,SAASD,OAAOE,QAGzBC,WAAa,SAAUC,EAAMC,GACzBC,KAAKF,KAAOA,EACZE,KAAKD,QAAUA,GAInBE,KAAM,SAAUC,EAAKC,GACjBA,EAAOA,MACPA,EAAKC,YAAcC,KAAKC,SAASC,SAAU,IAAKC,OAAQ,GAClDjB,EAAEkB,cAAeN,KACnBD,GAA6B,IAAtBA,EAAIQ,QAAS,KAAc,IAAM,IACxCR,GAAOX,EAAEoB,MAAOR,GAAO,IAE3BS,OAAOC,UACPb,KAAKc,SAAUZ,GAAOa,SAAW,KAIrCC,QAAS,SAAUC,EAAUC,EAAMC,GAC/BP,OAAOQ,MAAO,kBAAmBH,EAAUC,EAAMC,EACjD,IAAIE,GAAW7B,aAAa8B,MAAOJ,EAAKK,MACxCL,GAAKjB,KAAMoB,GACPJ,IACKjB,KAAKwB,aAAcN,EAAMC,GAC1BF,EAASQ,MAAOzB,KAAMkB,GAEtBlB,KAAK0B,kBAKjBF,aAAc,WACV,OAAO,GAGXE,cAAe,WACX1B,KAAKF,KAAK6B,QAAS,GAAIlC,IAAGmC,SAAWC,OAAQ,SAAUC,QAAS,sEAAuEC,YAAY,OAI3JC,QAAOC,QAAUvC"}
{"version":3,"file":"router.js","sources":["../../src/layout/router.js"],"names":["jQuery","require","$","QUERY_STRING","Ui","Router","Backbone","extend","initialize","page","options","this","push","url","data","__identifer","Math","random","toString","substr","isEmptyObject","indexOf","param","Galaxy","params","navigate","trigger","execute","callback","args","name","debug","queryObj","parse","pop","authenticate","apply","access_denied","display","Message","status","message","persistent","module","exports"],"mappings":"AAAA,GAAIA,QAASC,QAAS,UAClBC,EAAIF,OACJG,aAAeF,QAAS,8BACxBG,GAAKH,QAAS,kBAEdI,OAASC,SAASD,OAAOE,QAGzBC,WAAa,SAAUC,EAAMC,GACzBC,KAAKF,KAAOA,EACZE,KAAKD,QAAUA,GAInBE,KAAM,SAAUC,EAAKC,GACjBA,EAAOA,MACPA,EAAKC,YAAcC,KAAKC,SAASC,SAAU,IAAKC,OAAQ,GAClDjB,EAAEkB,cAAeN,KACnBD,GAA6B,IAAtBA,EAAIQ,QAAS,KAAc,IAAM,IACxCR,GAAOX,EAAEoB,MAAOR,GAAO,IAE3BS,OAAOC,OAASV,EAChBH,KAAKc,SAAUZ,GAAOa,SAAW,KAIrCC,QAAS,SAAUC,EAAUC,EAAMC,GAC/BP,OAAOQ,MAAO,kBAAmBH,EAAUC,EAAMC,EACjD,IAAIE,GAAW7B,aAAa8B,MAAOJ,EAAKK,MACxCL,GAAKjB,KAAMoB,GACPJ,IACKjB,KAAKwB,aAAcN,EAAMC,GAC1BF,EAASQ,MAAOzB,KAAMkB,GAEtBlB,KAAK0B,kBAKjBF,aAAc,WACV,OAAO,GAGXE,cAAe,WACX1B,KAAKF,KAAK6B,QAAS,GAAIlC,IAAGmC,SAAWC,OAAQ,SAAUC,QAAS,sEAAuEC,YAAY,OAI3JC,QAAOC,QAAUvC"}
static/maps/mvc/dataset/dataset-li-edit.js.map
+1 -1
View File
File diff suppressed because one or more lines are too long
static/scripts/bundled/admin.bundled.js
+1 -1
View File
File diff suppressed because one or more lines are too long
static/scripts/bundled/admin.bundled.js.map
+1 -1
View File
File diff suppressed because one or more lines are too long
static/scripts/bundled/analysis.bundled.js
+2 -2
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/layout/router.js
+1 -1
View File
@@ -1,2 +1,2 @@
var jQuery=require("jquery"),$=jQuery,QUERY_STRING=require("utils/query-string-parsing"),Ui=require("mvc/ui/ui-misc"),Router=Backbone.Router.extend({initialize:function(a,b){this.page=a,this.options=b},push:function(a,b){b=b||{},b.__identifer=Math.random().toString(36).substr(2),$.isEmptyObject(b)||(a+=-1==a.indexOf("?")?"?":"&",a+=$.param(b,!0)),Galaxy.params={},this.navigate(a,{trigger:!0})},execute:function(a,b,c){Galaxy.debug("router execute:",a,b,c);var d=QUERY_STRING.parse(b.pop());b.push(d),a&&(this.authenticate(b,c)?a.apply(this,b):this.access_denied())},authenticate:function(){return!0},access_denied:function(){this.page.display(new Ui.Message({status:"danger",message:"You must be logged in with proper credentials to make this request.",persistent:!0}))}});module.exports=Router;
var jQuery=require("jquery"),$=jQuery,QUERY_STRING=require("utils/query-string-parsing"),Ui=require("mvc/ui/ui-misc"),Router=Backbone.Router.extend({initialize:function(a,b){this.page=a,this.options=b},push:function(a,b){b=b||{},b.__identifer=Math.random().toString(36).substr(2),$.isEmptyObject(b)||(a+=-1==a.indexOf("?")?"?":"&",a+=$.param(b,!0)),Galaxy.params=b,this.navigate(a,{trigger:!0})},execute:function(a,b,c){Galaxy.debug("router execute:",a,b,c);var d=QUERY_STRING.parse(b.pop());b.push(d),a&&(this.authenticate(b,c)?a.apply(this,b):this.access_denied())},authenticate:function(){return!0},access_denied:function(){this.page.display(new Ui.Message({status:"danger",message:"You must be logged in with proper credentials to make this request.",persistent:!0}))}});module.exports=Router;
//# sourceMappingURL=../../maps/layout/router.js.map
static/scripts/mvc/dataset/dataset-li-edit.js
+1 -1
View File
File diff suppressed because one or more lines are too long
templates/show_params.mako
+2 -1
View File
@@ -1,6 +1,6 @@
<%inherit file="/base.mako"/>
<%namespace file="/message.mako" import="render_msg" />
<% from galaxy.util import listify, nice_size, unicodify %>
<% from galaxy.util import nice_size, unicodify %>
<style>
.inherit {
@@ -22,6 +22,7 @@
<%def name="inputs_recursive( input_params, param_values, depth=1, upgrade_messages=None )">
<%
from galaxy.util import listify
if upgrade_messages is None:
upgrade_messages = {}
%>