1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/18e8ddfb9c3c/
Changeset: 18e8ddfb9c3c
User: dannon
Date: 2014-08-12 17:25:22
Summary: Merged in peterjc/galaxy-central/tool_list_fix (pull request #456)
tool_list.py should now use tool_conf.xml not tool_conf.xml.sample
Affected #: 1 file
diff -r a94473459ebb4749a375420492d6da9a948ccd3a -r 18e8ddfb9c3c7407daae21b49d64300e4edf7cc4 tool_list.py
--- a/tool_list.py
+++ b/tool_list.py
@@ -3,7 +3,7 @@
#--------read tool_conf.xml.sample to get all the tool xml file names-----------
onoff = 1
tool_list = []
-for line in open("tool_conf.xml.sample", "r"):
+for line in open("tool_conf.xml", "r"):
if line.find("<!--") != -1:
onoff = 0
if line.find("file") != -1 and onoff==1:
Repository URL: https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
3 new commits in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/82a9821e0fbb/
Changeset: 82a9821e0fbb
Branch: tool_list_fix
User: peterjc
Date: 2014-08-12 17:13:05
Summary: Created new branch tool_list_fix
Affected #: 0 files
https://bitbucket.org/galaxy/galaxy-central/commits/24d8995c3568/
Changeset: 24d8995c3568
Branch: tool_list_fix
User: peterjc
Date: 2014-08-12 17:15:04
Summary: tool_list.py should now use tool_conf.xml not tool_conf.xml.sample
See a94473459ebb4749a375420492d6da9a948ccd3a where the rest of the run_functional_tests.sh system was updated.
Affected #: 1 file
diff -r 82a9821e0fbb3b4c9387152e48be189cc2829a45 -r 24d8995c35689fc42e96d6f02dc222cbf75531ed tool_list.py
--- a/tool_list.py
+++ b/tool_list.py
@@ -3,7 +3,7 @@
#--------read tool_conf.xml.sample to get all the tool xml file names-----------
onoff = 1
tool_list = []
-for line in open("tool_conf.xml.sample", "r"):
+for line in open("tool_conf.xml", "r"):
if line.find("<!--") != -1:
onoff = 0
if line.find("file") != -1 and onoff==1:
https://bitbucket.org/galaxy/galaxy-central/commits/18e8ddfb9c3c/
Changeset: 18e8ddfb9c3c
User: dannon
Date: 2014-08-12 17:25:22
Summary: Merged in peterjc/galaxy-central/tool_list_fix (pull request #456)
tool_list.py should now use tool_conf.xml not tool_conf.xml.sample
Affected #: 1 file
diff -r a94473459ebb4749a375420492d6da9a948ccd3a -r 18e8ddfb9c3c7407daae21b49d64300e4edf7cc4 tool_list.py
--- a/tool_list.py
+++ b/tool_list.py
@@ -3,7 +3,7 @@
#--------read tool_conf.xml.sample to get all the tool xml file names-----------
onoff = 1
tool_list = []
-for line in open("tool_conf.xml.sample", "r"):
+for line in open("tool_conf.xml", "r"):
if line.find("<!--") != -1:
onoff = 0
if line.find("file") != -1 and onoff==1:
Repository URL: https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/a94473459ebb/
Changeset: a94473459ebb
User: carlfeberhard
Date: 2014-08-12 16:45:26
Summary: History panel: clean up and documentation
Affected #: 19 files
diff -r 588c521575605b698ee15376f3b919f6a2cda20c -r a94473459ebb4749a375420492d6da9a948ccd3a static/scripts/mvc/collection/collection-li-edit.js
--- a/static/scripts/mvc/collection/collection-li-edit.js
+++ b/static/scripts/mvc/collection/collection-li-edit.js
@@ -13,7 +13,8 @@
var _super = DC_LI.DCListItemView;
/** @class Editing view for DatasetCollectionElement.
*/
-var DCEListItemEdit = _super.extend({
+var DCEListItemEdit = _super.extend(
+/** @lends DCEListItemEdit.prototype */{
/** logger used to record this.log messages, commonly set to console */
//logger : console,
diff -r 588c521575605b698ee15376f3b919f6a2cda20c -r a94473459ebb4749a375420492d6da9a948ccd3a static/scripts/mvc/collection/collection-li.js
--- a/static/scripts/mvc/collection/collection-li.js
+++ b/static/scripts/mvc/collection/collection-li.js
@@ -8,7 +8,8 @@
var ListItemView = BASE_MVC.ListItemView;
/** @class Read only view for DatasetCollection.
*/
-var DCListItemView = ListItemView.extend({
+var DCListItemView = ListItemView.extend(
+/** @lends DCListItemView.prototype */{
//TODO: may not be needed
/** logger used to record this.log messages, commonly set to console */
@@ -26,7 +27,7 @@
ListItemView.prototype.initialize.call( this, attributes );
},
- /** In this override, don't show`or render any details (no need to do anything here)
+ /** In this override, don't show or render any details (no need to do anything here)
* - currently the parent control will load a panel for this collection over itself
* @fires expanded when a body has been expanded
*/
@@ -87,7 +88,8 @@
//==============================================================================
/** @class Read only view for DatasetCollectionElement.
*/
-var DCEListItemView = ListItemView.extend({
+var DCEListItemView = ListItemView.extend(
+/** @lends DCEListItemView.prototype */{
//TODO: this might be expendable - compacted with HDAListItemView
/** logger used to record this.log messages, commonly set to console */
@@ -99,7 +101,7 @@
/** jq fx speed for this view */
fxSpeed : 'fast',
- /** */
+ /** set up */
initialize : function( attributes ){
if( attributes.logger ){ this.logger = this.model.logger = attributes.logger; }
this.log( 'DCEListItemView.initialize:', attributes );
@@ -138,14 +140,15 @@
/** @class Read only view for a DatasetCollectionElement that is also an DatasetAssociation
* (a dataset contained in a dataset collection).
*/
-var DatasetDCEListItemView = DATASET_LI.DatasetListItemView.extend({
+var DatasetDCEListItemView = DATASET_LI.DatasetListItemView.extend(
+/** @lends DatasetDCEListItemView.prototype */{
className : DATASET_LI.DatasetListItemView.prototype.className + " dataset-collection-element",
/** logger used to record this.log messages, commonly set to console */
//logger : console,
- /** */
+ /** set up */
initialize : function( attributes ){
if( attributes.logger ){ this.logger = this.model.logger = attributes.logger; }
this.log( 'DatasetDCEListItemView.initialize:', attributes );
@@ -185,7 +188,8 @@
/** @class Read only view for a DatasetCollectionElement that is also a DatasetCollection
* (a nested DC).
*/
-var NestedDCDCEListItemView = DCListItemView.extend({
+var NestedDCDCEListItemView = DCListItemView.extend(
+/** @lends NestedDCDCEListItemView.prototype */{
className : DCListItemView.prototype.className + " dataset-collection-element",
diff -r 588c521575605b698ee15376f3b919f6a2cda20c -r a94473459ebb4749a375420492d6da9a948ccd3a static/scripts/mvc/collection/collection-model.js
--- a/static/scripts/mvc/collection/collection-model.js
+++ b/static/scripts/mvc/collection/collection-model.js
@@ -47,7 +47,7 @@
* When collection elements are passed from the API, the underlying element is
* in a sub-object 'object' (IOW, a DCE representing an HDA will have HDA json in element.object).
* This mixin uses the constructor and parse methods to merge that JSON with the DCE attribtues
- * effectively changing a DCE from a container to a subclass.
+ * effectively changing a DCE from a container to a subclass (has a --> is a).
*/
var DatasetCollectionElementMixin = {
@@ -82,7 +82,7 @@
};
//TODO: unused?
-/** Concrete class of Generic DatasetCollectionElement */
+/** @class Concrete class of Generic DatasetCollectionElement */
var DatasetCollectionElement = Backbone.Model
.extend( BASE_MVC.LoggableMixin )
.extend( DatasetCollectionElementMixin );
@@ -94,7 +94,6 @@
/** @lends DCECollection.prototype */{
model: DatasetCollectionElement,
- // comment this out to suppress log output
/** logger used to record this.log messages, commonly set to console */
//logger : console,
@@ -124,7 +123,10 @@
/** logger used to record this.log messages, commonly set to console */
//logger : console,
- defaults : _.extend( {}, DATASET_MODEL.DatasetAssociation.prototype.defaults, DatasetCollectionElementMixin.defaults ),
+ defaults : _.extend( {},
+ DATASET_MODEL.DatasetAssociation.prototype.defaults,
+ DatasetCollectionElementMixin.defaults
+ ),
// because all objects have constructors (as this hashmap would even if this next line wasn't present)
// the constructor in hcontentMixin won't be attached by BASE_MVC.mixin to this model
@@ -162,7 +164,7 @@
//logger : console,
//TODO: unused?
- /** */
+ /** set up */
initialize : function( attributes, options ){
this.debug( this + '(DatasetDCECollection).initialize:', attributes, options );
DCECollection.prototype.initialize.call( this, attributes, options );
@@ -203,7 +205,7 @@
/** Which class to use for elements */
collectionClass : DCECollection,
- /** */
+ /** set up: create elements instance var and (on changes to elements) update them */
initialize : function( model, options ){
this.debug( this + '(DatasetCollection).initialize:', model, options, this );
//historyContent.HistoryContent.prototype.initialize.call( this, attrs, options );
@@ -269,6 +271,7 @@
},
// ........................................................................ searchable
+ /** searchable attributes for collections */
searchAttributes : [
'name'
],
@@ -291,6 +294,7 @@
/** logger used to record this.log messages, commonly set to console */
//logger : console,
+ /** override since we know the collection will only contain datasets */
collectionClass : DatasetDCECollection,
//TODO: unused?
@@ -368,10 +372,11 @@
/** logger used to record this.log messages, commonly set to console */
//logger : console,
+ /** This is a collection of nested collections */
model: NestedDCDCE,
//TODO: unused?
- /** */
+ /** set up */
initialize : function( attrs, options ){
this.debug( this + '(NestedDCDCECollection).initialize:', attrs, options );
DCECollection.prototype.initialize.call( this, attrs, options );
@@ -394,7 +399,10 @@
/** logger used to record this.log messages, commonly set to console */
//logger : console,
- /** */
+ // because all objects have constructors (as this hashmap would even if this next line wasn't present)
+ // the constructor in hcontentMixin won't be attached by BASE_MVC.mixin to this model
+ // - re-apply manually it now
+ /** This is both a collection and a collection element - call the constructor */
constructor : function( attributes, options ){
this.debug( '\t NestedPairDCDCE.constructor:', attributes, options );
//DatasetCollection.constructor.call( this, attributes, options );
@@ -418,10 +426,11 @@
/** logger used to record this.log messages, commonly set to console */
//logger : console,
+ /** We know this collection is composed of only nested pair collections */
model: NestedPairDCDCE,
//TODO: unused?
- /** */
+ /** set up */
initialize : function( attrs, options ){
this.debug( this + '(NestedPairDCDCECollection).initialize:', attrs, options );
NestedDCDCECollection.prototype.initialize.call( this, attrs, options );
@@ -443,11 +452,11 @@
/** logger used to record this.log messages, commonly set to console */
//logger : console,
- // list:paired is the only collection that itself contains collections
+ /** list:paired is the only collection that itself contains collections */
collectionClass : NestedPairDCDCECollection,
//TODO: unused?
- /** */
+ /** set up */
initialize : function( attributes, options ){
this.debug( this + '(ListPairedDatasetCollection).initialize:', attributes, options );
DatasetCollection.prototype.initialize.call( this, attributes, options );
diff -r 588c521575605b698ee15376f3b919f6a2cda20c -r a94473459ebb4749a375420492d6da9a948ccd3a static/scripts/mvc/collection/collection-panel.js
--- a/static/scripts/mvc/collection/collection-panel.js
+++ b/static/scripts/mvc/collection/collection-panel.js
@@ -24,7 +24,9 @@
/** (in ms) that jquery effects will use */
fxSpeed : 'fast',
+ /** sub view class used for datasets */
DatasetDCEViewClass : DC_LI.DatasetDCEListItemView,
+ /** sub view class used for nested collections */
NestedDCDCEViewClass : DC_LI.NestedDCDCEListItemView,
// ......................................................................... SET UP
@@ -229,7 +231,7 @@
}
},
- /** */
+ /** When a sub-collection is clicked, hide the current panel and render the sub-collection in its own panel */
_addCollectionPanel : function( collectionView ){
//TODO: a bit hackish
var currPanel = this,
@@ -333,9 +335,11 @@
// =============================================================================
/** @class non-editable, read-only View/Controller for a dataset collection. */
-var ListCollectionPanel = CollectionPanel.extend({
+var ListCollectionPanel = CollectionPanel.extend(
+/** @lends ListCollectionPanel.prototype */{
//TODO: not strictly needed - due to switch in CollectionPanel._getContentClass
+ /** sub view class used for datasets */
DatasetDCEViewClass : DC_LI.DatasetDCEListItemView,
// ........................................................................ misc
@@ -348,7 +352,8 @@
// =============================================================================
/** @class non-editable, read-only View/Controller for a dataset collection. */
-var PairCollectionPanel = ListCollectionPanel.extend({
+var PairCollectionPanel = ListCollectionPanel.extend(
+/** @lends PairCollectionPanel.prototype */{
// ........................................................................ misc
/** string rep */
@@ -360,9 +365,11 @@
// =============================================================================
/** @class non-editable, read-only View/Controller for a dataset collection. */
-var ListOfPairsCollectionPanel = CollectionPanel.extend({
+var ListOfPairsCollectionPanel = CollectionPanel.extend(
+/** @lends ListOfPairsCollectionPanel.prototype */{
//TODO: not strictly needed - due to switch in CollectionPanel._getContentClass
+ /** sub view class used for nested collections */
NestedDCDCEViewClass : DC_LI.NestedDCDCEListItemView,
// ........................................................................ misc
diff -r 588c521575605b698ee15376f3b919f6a2cda20c -r a94473459ebb4749a375420492d6da9a948ccd3a static/scripts/mvc/dataset/dataset-model.js
--- a/static/scripts/mvc/dataset/dataset-model.js
+++ b/static/scripts/mvc/dataset/dataset-model.js
@@ -10,7 +10,7 @@
* The DA's are made searchable (by attribute) by mixing in SearchableModelMixin.
*/
var DatasetAssociation = Backbone.Model.extend( BASE_MVC.LoggableMixin ).extend(
- BASE_MVC.mixin( searchableMixin, {
+ BASE_MVC.mixin( searchableMixin, /** @lends DatasetAssociation.prototype */{
/** default attributes for a model */
defaults : {
@@ -43,8 +43,10 @@
//annotation : ''
},
- initialize : function( attrs, options ){
- this.debug( 'Dataset.initialize', attrs, options );
+ /** instance vars and listeners */
+ initialize : function( attributes, options ){
+ this.debug( this + '(Dataset).initialize', attributes, options );
+
//!! this state is not in trans.app.model.Dataset.states - set it here -
if( !this.get( 'accessible' ) ){
this.set( 'state', STATES.NOT_VIEWABLE );
@@ -62,7 +64,6 @@
var id = this.get( 'id' );
if( !id ){ return {}; }
var urls = {
-//TODO: how many of these are still used?
'purge' : 'datasets/' + id + '/purge_async',
'display' : 'datasets/' + id + '/display/?preview=True',
'edit' : 'datasets/' + id + '/edit',
@@ -146,6 +147,7 @@
return this.save( { deleted: false }, options );
},
+ /** remove the file behind this dataset from the filesystem (if permitted) */
purge : function _purge( options ){
//TODO: use, override model.destroy, HDA.delete({ purge: true })
if( this.get( 'purged' ) ){ return jQuery.when(); }
@@ -160,7 +162,7 @@
// }, options ));
//
//xhr.done( function( response ){
- // console.debug( 'response', response );
+ // hda.debug( 'response', response );
// //hda.set({ deleted: true, purged: true });
// hda.set( response );
//});
diff -r 588c521575605b698ee15376f3b919f6a2cda20c -r a94473459ebb4749a375420492d6da9a948ccd3a static/scripts/mvc/dataset/states.js
--- a/static/scripts/mvc/dataset/states.js
+++ b/static/scripts/mvc/dataset/states.js
@@ -27,8 +27,9 @@
PAUSED : 'paused',
/** metadata discovery/setting failed or errored (but otherwise ok) */
FAILED_METADATA : 'failed_metadata',
+//TODO: not in trans.app.model.Dataset.states - is in database
/** not accessible to the current user (i.e. due to permissions) */
- NOT_VIEWABLE : 'noPermission', // not in trans.app.model.Dataset.states
+ NOT_VIEWABLE : 'noPermission',
/** deleted while uploading */
DISCARDED : 'discarded',
/** the tool producing this dataset failed */
diff -r 588c521575605b698ee15376f3b919f6a2cda20c -r a94473459ebb4749a375420492d6da9a948ccd3a static/scripts/mvc/history/hdca-li-edit.js
--- a/static/scripts/mvc/history/hdca-li-edit.js
+++ b/static/scripts/mvc/history/hdca-li-edit.js
@@ -7,7 +7,8 @@
var _super = HDCA_LI.HDCAListItemView;
/** @class Editing view for HistoryDatasetCollectionAssociation.
*/
-var HDCAListItemEdit = _super.extend({
+var HDCAListItemEdit = _super.extend(
+/** @lends HDCAListItemEdit.prototype */{
/** logger used to record this.log messages, commonly set to console */
//logger : console,
diff -r 588c521575605b698ee15376f3b919f6a2cda20c -r a94473459ebb4749a375420492d6da9a948ccd3a static/scripts/mvc/history/hdca-li.js
--- a/static/scripts/mvc/history/hdca-li.js
+++ b/static/scripts/mvc/history/hdca-li.js
@@ -9,13 +9,12 @@
var _super = DC_LI.DCListItemView;
/** @class Read only view for HistoryDatasetCollectionAssociation (a dataset collection inside a history).
*/
-var HDCAListItemView = _super.extend({
+var HDCAListItemView = _super.extend(
+/** @lends HDCAListItemView.prototype */{
/** logger used to record this.log messages, commonly set to console */
//logger : console,
-//TODO: not a dataset
- /** */
className : _super.prototype.className + " history-content",
/** In this override, add the state as a class for use with state-based CSS */
diff -r 588c521575605b698ee15376f3b919f6a2cda20c -r a94473459ebb4749a375420492d6da9a948ccd3a static/scripts/mvc/history/hdca-model.js
--- a/static/scripts/mvc/history/hdca-model.js
+++ b/static/scripts/mvc/history/hdca-model.js
@@ -19,7 +19,6 @@
//==============================================================================
/** @class Backbone model for List Dataset Collection within a History.
- * @constructs
*/
var HistoryListDatasetCollection = ListDC.extend( hcontentMixin ).extend(
/** @lends HistoryListDatasetCollection.prototype */{
diff -r 588c521575605b698ee15376f3b919f6a2cda20c -r a94473459ebb4749a375420492d6da9a948ccd3a static/scripts/mvc/history/history-content-model.js
--- a/static/scripts/mvc/history/history-content-model.js
+++ b/static/scripts/mvc/history/history-content-model.js
@@ -34,20 +34,24 @@
// Build a new id (type_id) that prefixes the history_content_type so the bbone collection can differentiate
idAttribute : 'type_id',
+ /** override constructor to build type_id and insert into original attributes */
constructor : function( attrs, options ){
attrs.type_id = typeIdStr( attrs.history_content_type, attrs.id );
this.debug( 'HistoryContentMixin.constructor:', attrs.type_id );
Backbone.Model.apply( this, arguments );
},
+ /** object level fn for building the type_id string */
_typeIdStr : function(){
return typeIdStr( this.get( 'history_content_type' ), this.get( 'id' ) );
},
+ /** add listener to re-create type_id when the id changes */
initialize : function( attrs, options ){
this.on( 'change:id', this._createTypeId );
},
+ /** set the type_id in the model attributes */
_createTypeId : function(){
this.set( 'type_id', this._typeIdStr() );
},
@@ -90,12 +94,12 @@
return url;
},
- /** save this HDA as not visible */
+ /** save this content as not visible */
hide : function( options ){
if( !this.get( 'visible' ) ){ return jQuery.when(); }
return this.save( { visible: false }, options );
},
- /** save this HDA as visible */
+ /** save this content as visible */
unhide : function( options ){
if( this.get( 'visible' ) ){ return jQuery.when(); }
return this.save( { visible: true }, options );
@@ -114,6 +118,7 @@
//==============================================================================
+//TODO: needed?
/** @class (Concrete/non-mixin) base model for content items.
*/
var HistoryContent = Backbone.Model.extend( BASE_MVC.LoggableMixin ).extend( HistoryContentMixin );
diff -r 588c521575605b698ee15376f3b919f6a2cda20c -r a94473459ebb4749a375420492d6da9a948ccd3a static/scripts/mvc/history/history-contents.js
--- a/static/scripts/mvc/history/history-contents.js
+++ b/static/scripts/mvc/history/history-contents.js
@@ -26,7 +26,6 @@
/** since history content is a mix, override model fn into a factory, creating based on history_content_type */
model : function( attrs, options ) {
- //console.debug( 'HistoryContents.model:', attrs, options );
//TODO: can we move the type_id stuff here?
//attrs.type_id = typeIdStr( attrs );
@@ -70,24 +69,25 @@
},
// ........................................................................ common queries
- /** Get the ids of every hda in this collection
+ /** Get the ids of every item in this collection
* @returns array of encoded ids
*/
ids : function(){
- return this.map( function( hda ){ return hda.get('id'); });
+//TODO: is this still useful since type_id
+ return this.map( function( item ){ return item.get('id'); });
},
- /** Get hdas that are not ready
- * @returns array of HDAs
+ /** Get contents that are not ready
+ * @returns array of content models
*/
notReady : function(){
- return this.filter( function( hda ){
- return !hda.inReadyState();
+ return this.filter( function( content ){
+ return !content.inReadyState();
});
},
- /** Get the id of every hda in this collection not in a 'ready' state (running).
- * @returns an array of hda ids
+ /** Get the id of every model in this collection not in a 'ready' state (running).
+ * @returns an array of model ids
* @see HistoryDatasetAssociation#inReadyState
*/
running : function(){
@@ -95,24 +95,26 @@
this.each( function( item ){
var isRunning = !item.inReadyState();
if( isRunning ){
+//TODO: is this still correct since type_id
idList.push( item.get( 'id' ) );
}
});
return idList;
},
- /** Get the hda with the given hid
+ /** Get the model with the given hid
* @param {Int} hid the hid to search for
- * @returns {HistoryDatasetAssociation} the hda with the given hid or undefined if not found
+ * @returns {HistoryDatasetAssociation} the model with the given hid or undefined if not found
*/
getByHid : function( hid ){
- return _.first( this.filter( function( hda ){ return hda.get( 'hid' ) === hid; }) );
+ return _.first( this.filter( function( content ){ return content.get( 'hid' ) === hid; }) );
},
- /** Get every 'shown' hda in this collection based on show_deleted/hidden
- * @param {Boolean} show_deleted are we showing deleted hdas?
- * @param {Boolean} show_hidden are we showing hidden hdas?
- * @returns array of hda models
+ //TODO:?? this may belong in the containing view
+ /** Get every 'shown' model in this collection based on show_deleted/hidden
+ * @param {Boolean} show_deleted are we showing deleted content?
+ * @param {Boolean} show_hidden are we showing hidden content?
+ * @returns array of content models
* @see HistoryDatasetAssociation#isVisible
*/
getVisible : function( show_deleted, show_hidden, filters ){
@@ -131,13 +133,13 @@
return filteredHdas;
},
- /** return true if any hdas don't have details */
+ /** return true if any contents don't have details */
haveDetails : function(){
- return this.all( function( hda ){ return hda.hasDetails(); });
+ return this.all( function( content ){ return content.hasDetails(); });
},
// ........................................................................ ajax
- /** fetch detailed model data for all HDAs in this collection */
+ /** fetch detailed model data for all contents in this collection */
fetchAllDetails : function( options ){
options = options || {};
var detailsFlag = { details: 'all' };
@@ -145,8 +147,8 @@
return this.fetch( options );
},
- /** using a queue, perform hdaAjaxFn on each of the hdas in this collection */
- ajaxQueue : function( hdaAjaxFn, options ){
+ /** using a queue, perform ajaxFn on each of the models in this collection */
+ ajaxQueue : function( ajaxFn, options ){
var deferred = jQuery.Deferred(),
startingLength = this.length,
responses = [];
@@ -157,12 +159,12 @@
}
// use reverse order (stylistic choice)
- var ajaxFns = this.chain().reverse().map( function( hda, i ){
+ var ajaxFns = this.chain().reverse().map( function( content, i ){
return function(){
- var xhr = hdaAjaxFn.call( hda, options );
+ var xhr = ajaxFn.call( content, options );
// if successful, notify using the deferred to allow tracking progress
xhr.done( function( response ){
- deferred.notify({ curr: i, total: startingLength, response: response, model: hda });
+ deferred.notify({ curr: i, total: startingLength, response: response, model: content });
});
// (regardless of previous error or success) if not last ajax call, shift and call the next
// if last fn, resolve deferred
@@ -183,17 +185,18 @@
},
// ........................................................................ sorting/filtering
- /** return a new collection of HDAs whose attributes contain the substring matchesWhat */
+ /** return a new collection of contents whose attributes contain the substring matchesWhat */
matches : function( matchesWhat ){
- return this.filter( function( hda ){
- return hda.matches( matchesWhat );
+ return this.filter( function( content ){
+ return content.matches( matchesWhat );
});
},
// ........................................................................ misc
+ /** override to get a correct/smarter merge when incoming data is partial */
set : function( models, options ){
// arrrrrrrrrrrrrrrrrg...
- // override to get a correct/smarter merge when incoming data is partial (e.g. stupid backbone)
+ // (e.g. stupid backbone)
// w/o this partial models from the server will fill in missing data with model defaults
// and overwrite existing data on the client
// see Backbone.Collection.set and _prepareModel
@@ -213,7 +216,7 @@
Backbone.Collection.prototype.set.call( this, models, options );
},
- /** Convert this ad-hoc collection of HDAs to a formal collection tracked
+ /** Convert this ad-hoc collection of hdas to a formal collection tracked
by the server.
**/
promoteToHistoryDatasetCollection : function _promote( history, collection_type, options ){
diff -r 588c521575605b698ee15376f3b919f6a2cda20c -r a94473459ebb4749a375420492d6da9a948ccd3a static/scripts/mvc/history/history-panel-annotated.js
--- a/static/scripts/mvc/history/history-panel-annotated.js
+++ b/static/scripts/mvc/history/history-panel-annotated.js
@@ -23,7 +23,7 @@
* @constructs
*/
var AnnotatedHistoryPanel = _super.extend(
-/** @lends HistoryPanel.prototype */{
+/** @lends AnnotatedHistoryPanel.prototype */{
/** logger used to record this.log messages, commonly set to console */
// comment this out to suppress log output
diff -r 588c521575605b698ee15376f3b919f6a2cda20c -r a94473459ebb4749a375420492d6da9a948ccd3a static/scripts/mvc/history/history-panel-edit-current.js
--- a/static/scripts/mvc/history/history-panel-edit-current.js
+++ b/static/scripts/mvc/history/history-panel-edit-current.js
@@ -7,7 +7,8 @@
// ============================================================================
/** session storage for history panel preferences (and to maintain state)
*/
-var HistoryPanelPrefs = BASE_MVC.SessionStorageModel.extend({
+var HistoryPanelPrefs = BASE_MVC.SessionStorageModel.extend(
+/** @lends HistoryPanelPrefs.prototype */{
defaults : {
/** is the panel currently showing the search/filter controls? */
searching : false,
diff -r 588c521575605b698ee15376f3b919f6a2cda20c -r a94473459ebb4749a375420492d6da9a948ccd3a static/scripts/mvc/history/history-panel-edit.js
--- a/static/scripts/mvc/history/history-panel-edit.js
+++ b/static/scripts/mvc/history/history-panel-edit.js
@@ -333,9 +333,9 @@
// maintain a list of hdas that are selected
hdaView.on( 'selected', function( hdaView, event ){
if( !event ){ return; }
- //console.debug( 'selected', event );
+ //this.debug( 'selected', event );
var selectedIds = [];
- //console.debug( historyView.lastSelectedViewId, historyView.hdaViews[ historyView.lastSelectedViewId ] );
+ //this.debug( historyView.lastSelectedViewId, historyView.hdaViews[ historyView.lastSelectedViewId ] );
// shift will select a range, but not set lastSelectedViewId
if( ( event.shiftKey )
@@ -348,19 +348,19 @@
} else {
var id = hdaView.model.id;
historyView.lastSelectedViewId = id;
- //console.debug( 'lastSelectedViewId:', historyView.lastSelectedViewId );
+ //this.debug( 'lastSelectedViewId:', historyView.lastSelectedViewId );
selectedIds = [ id ];
}
- //console.debug( 'selectedIds:', selectedIds );
+ //this.debug( 'selectedIds:', selectedIds );
historyView.selectedHdaIds = _.union( historyView.selectedHdaIds, selectedIds );
//TODO: might want to use getSelectedHdaViews instead managing these lists with ops
- //console.debug( 'selected', historyView.selectedHdaIds );
+ //this.debug( 'selected', historyView.selectedHdaIds );
});
hdaView.on( 'de-selected', function( hdaView, event ){
- //console.debug( 'de-selected', event );
+ //this.debug( 'de-selected', event );
var id = hdaView.model.id;
historyView.selectedHdaIds = _.without( historyView.selectedHdaIds, id );
- //console.debug( 'de-selected', historyView.selectedHdaIds );
+ //this.debug( 'de-selected', historyView.selectedHdaIds );
});
},
diff -r 588c521575605b698ee15376f3b919f6a2cda20c -r a94473459ebb4749a375420492d6da9a948ccd3a static/scripts/mvc/history/history-panel.js
--- a/static/scripts/mvc/history/history-panel.js
+++ b/static/scripts/mvc/history/history-panel.js
@@ -8,7 +8,9 @@
], function( HISTORY_MODEL, HDA_LI, HDCA_LI, USER, BASE_MVC, _l ){
// ============================================================================
/** session storage for individual history preferences */
-var HistoryPrefs = BASE_MVC.SessionStorageModel.extend({
+var HistoryPrefs = BASE_MVC.SessionStorageModel.extend(
+/** @lends HistoryPrefs.prototype */{
+
defaults : {
//TODO:?? expandedHdas to array?
expandedHdas : {},
@@ -85,6 +87,7 @@
/** class to use for constructing the HDA views */
HDAViewClass : HDA_LI.HDAListItemView,
+ /** class to use for constructing the HDCA views */
HDCAViewClass : HDCA_LI.HDCAListItemView,
tagName : 'div',
@@ -753,17 +756,17 @@
this.storage.get( 'show_hidden' ),
this.filters
).each( function( hda ){
- //console.debug( 'checking: ', hda.get( 'name' ) );
+ //panel.debug( 'checking: ', hda.get( 'name' ) );
if( withinSet ){
- //console.debug( '\t\t adding: ', hda.get( 'name' ) );
+ //panel.debug( '\t\t adding: ', hda.get( 'name' ) );
set.push( panel.hdaViews[ hda.id ] );
if( hda === viewA.model || hda === viewB.model ){
- //console.debug( '\t found last: ', hda.get( 'name' ) );
+ //panel.debug( '\t found last: ', hda.get( 'name' ) );
withinSet = false;
}
} else {
if( hda === viewA.model || hda === viewB.model ){
- //console.debug( 'found first: ', hda.get( 'name' ) );
+ //panel.debug( 'found first: ', hda.get( 'name' ) );
withinSet = true;
set.push( panel.hdaViews[ hda.id ] );
}
diff -r 588c521575605b698ee15376f3b919f6a2cda20c -r a94473459ebb4749a375420492d6da9a948ccd3a static/scripts/packed/mvc/collection/collection-panel.js
--- a/static/scripts/packed/mvc/collection/collection-panel.js
+++ b/static/scripts/packed/mvc/collection/collection-panel.js
@@ -1,1 +1,1 @@
-define(["mvc/collection/collection-model","mvc/collection/collection-li","mvc/base-mvc","utils/localization"],function(h,f,a,e){var d=Backbone.View.extend(a.LoggableMixin).extend({tagName:"div",className:"dataset-collection-panel",fxSpeed:"fast",DatasetDCEViewClass:f.DatasetDCEListItemView,NestedDCDCEViewClass:f.NestedDCDCEListItemView,initialize:function(i){i=i||{};if(i.logger){this.logger=i.logger}this.log(this+".initialize:",i);this.linkTarget=i.linkTarget||"_blank";this.hasUser=i.hasUser;this.panelStack=[];this.parentName=i.parentName;window.collectionPanel=this},_setUpListeners:function(){this.on("all",function(i){this.log(this+"",arguments)},this);return this},_setUpModelEventHandlers:function(){return this},render:function(k,l){this.log("render:",k,l);k=(k===undefined)?(this.fxSpeed):(k);var i=this,j;if(!this.model){return this}j=this.renderModel();$(i).queue("fx",[function(m){if(k&&i.$el.is(":visible")){i.$el.fadeOut(k,m)}else{m()}},function(m){i.$el.empty();if(j){i.$el.append(j.children())}m()},function(m){if(k&&!i.$el.is(":visible")){i.$el.fadeIn(k,m)}else{m()}},function(m){if(l){l.call(this)}i.trigger("rendered",this);m()}]);return this},renderModel:function(){var k=this.model.get("collection_type")||this.model.object.get("collection_type"),j=_.extend(this.model.toJSON(),{parentName:this.parentName,type:k}),i=$("<div/>").append(this.templates.panel(j));this._setUpBehaviours(i);this.renderContents(i);return i},_setUpBehaviours:function(i){i=i||this.$el;i.find("[title]").tooltip({placement:"bottom"});return this},$container:function(){return(this.findContainerFn)?(this.findContainerFn.call(this)):(this.$el.parent())},$datasetsList:function(i){return(i||this.$el).find(".datasets-list")},renderContents:function(j){j=j||this.$el;this.warn(this+".renderContents:, model:",this.model);var i=this,l={},k=this.model.getVisibleContents();this.$datasetsList(j).empty();if(k&&k.length){k.each(function(n){var o=n.id,m=i._createContentView(n);l[o]=m;i._attachContentView(m.render(),j)})}this.contentViews=l;return this.contentViews},_createContentView:function(k){var j=null,i=this._getContentClass(k);j=new i({model:k,linkTarget:this.linkTarget,hasUser:this.hasUser,logger:this.logger});this._setUpContentListeners(j);return j},_getContentClass:function(i){switch(i.get("element_type")){case"hda":return this.DatasetDCEViewClass;case"dataset_collection":return this.NestedDCDCEViewClass}throw new TypeError("Unknown element type:",i.get("element_type"))},_setUpContentListeners:function(j){var i=this;if(j.model.get("element_type")==="dataset_collection"){j.on("expanded",function(k){i.info("expanded",k);i._addCollectionPanel(k)})}},_addCollectionPanel:function(k){var l=this,i=k.model;var j=new c({model:i,parentName:this.model.get("name"),linkTarget:this.linkTarget});l.panelStack.push(j);l.$(".controls").add(".datasets-list").hide();l.$el.append(j.$el);j.on("close",function(){l.render();k.collapse();l.panelStack.pop()});if(!j.model.hasDetails()){var m=j.model.fetch();m.done(function(){j.render()})}else{j.render()}},_attachContentView:function(k,j){j=j||this.$el;var i=this.$datasetsList(j);i.append(k.$el);return this},events:{"click .navigation .back":"close"},close:function(i){this.$el.remove();this.trigger("close")},toString:function(){return"CollectionPanel("+((this.model)?(this.model.get("name")):(""))+")"}});d.templates=d.prototype.templates=(function(){var i=_.template(['<div class="controls">','<div class="navigation">','<a class="back" href="javascript:void(0)">','<span class="fa fa-icon fa-angle-left"></span>',e("Back to "),"<%- collection.parentName %>","</a>","</div>",'<div class="title">','<div class="name"><%- collection.name || collection.element_identifier %></div>','<div class="subtitle">','<% if( collection.type === "list" ){ %>',e("a list of datasets"),'<% } else if( collection.type === "paired" ){ %>',e("a pair of datasets"),'<% } else if( collection.type === "list:paired" ){ %>',e("a list of paired datasets"),"<% } %>","</div>","</div>","</div>",'<div class="datasets-list"></div>'].join(""));return{panel:function(j){return i({_l:e,collection:j})}}}());var b=d.extend({DatasetDCEViewClass:f.DatasetDCEListItemView,toString:function(){return"ListCollectionPanel("+((this.model)?(this.model.get("name")):(""))+")"}});var c=b.extend({toString:function(){return"PairCollectionPanel("+((this.model)?(this.model.get("name")):(""))+")"}});var g=d.extend({NestedDCDCEViewClass:f.NestedDCDCEListItemView,toString:function(){return"ListOfPairsCollectionPanel("+((this.model)?(this.model.get("name")):(""))+")"}});return{CollectionPanel:d,ListCollectionPanel:b,PairCollectionPanel:c,ListOfPairsCollectionPanel:g}});
\ No newline at end of file
+define(["mvc/collection/collection-model","mvc/collection/collection-li","mvc/base-mvc","utils/localization"],function(h,f,a,e){var d=Backbone.View.extend(a.LoggableMixin).extend({tagName:"div",className:"dataset-collection-panel",fxSpeed:"fast",DatasetDCEViewClass:f.DatasetDCEListItemView,NestedDCDCEViewClass:f.NestedDCDCEListItemView,initialize:function(i){i=i||{};if(i.logger){this.logger=i.logger}this.log(this+".initialize:",i);this.linkTarget=i.linkTarget||"_blank";this.hasUser=i.hasUser;this.panelStack=[];this.parentName=i.parentName},_setUpListeners:function(){this.on("all",function(i){this.log(this+"",arguments)},this);return this},_setUpModelEventHandlers:function(){return this},render:function(k,l){this.log("render:",k,l);k=(k===undefined)?(this.fxSpeed):(k);var i=this,j;if(!this.model){return this}j=this.renderModel();$(i).queue("fx",[function(m){if(k&&i.$el.is(":visible")){i.$el.fadeOut(k,m)}else{m()}},function(m){i.$el.empty();if(j){i.$el.append(j.children())}m()},function(m){if(k&&!i.$el.is(":visible")){i.$el.fadeIn(k,m)}else{m()}},function(m){if(l){l.call(this)}i.trigger("rendered",this);m()}]);return this},renderModel:function(){var k=this.model.get("collection_type")||this.model.object.get("collection_type"),j=_.extend(this.model.toJSON(),{parentName:this.parentName,type:k}),i=$("<div/>").append(this.templates.panel(j));this._setUpBehaviours(i);this.renderContents(i);return i},_setUpBehaviours:function(i){i=i||this.$el;i.find("[title]").tooltip({placement:"bottom"});return this},$container:function(){return(this.findContainerFn)?(this.findContainerFn.call(this)):(this.$el.parent())},$datasetsList:function(i){return(i||this.$el).find(".datasets-list")},renderContents:function(j){j=j||this.$el;this.warn(this+".renderContents:, model:",this.model);var i=this,l={},k=this.model.getVisibleContents();this.$datasetsList(j).empty();if(k&&k.length){k.each(function(n){var o=n.id,m=i._createContentView(n);l[o]=m;i._attachContentView(m.render(),j)})}this.contentViews=l;return this.contentViews},_createContentView:function(k){var j=null,i=this._getContentClass(k);j=new i({model:k,linkTarget:this.linkTarget,hasUser:this.hasUser,logger:this.logger});this._setUpContentListeners(j);return j},_getContentClass:function(i){switch(i.get("element_type")){case"hda":return this.DatasetDCEViewClass;case"dataset_collection":return this.NestedDCDCEViewClass}throw new TypeError("Unknown element type:",i.get("element_type"))},_setUpContentListeners:function(j){var i=this;if(j.model.get("element_type")==="dataset_collection"){j.on("expanded",function(k){i.info("expanded",k);i._addCollectionPanel(k)})}},_addCollectionPanel:function(k){var l=this,i=k.model;var j=new c({model:i,parentName:this.model.get("name"),linkTarget:this.linkTarget});l.panelStack.push(j);l.$(".controls").add(".datasets-list").hide();l.$el.append(j.$el);j.on("close",function(){l.render();k.collapse();l.panelStack.pop()});if(!j.model.hasDetails()){var m=j.model.fetch();m.done(function(){j.render()})}else{j.render()}},_attachContentView:function(k,j){j=j||this.$el;var i=this.$datasetsList(j);i.append(k.$el);return this},events:{"click .navigation .back":"close"},close:function(i){this.$el.remove();this.trigger("close")},toString:function(){return"CollectionPanel("+((this.model)?(this.model.get("name")):(""))+")"}});d.templates=d.prototype.templates=(function(){var i=_.template(['<div class="controls">','<div class="navigation">','<a class="back" href="javascript:void(0)">','<span class="fa fa-icon fa-angle-left"></span>',e("Back to "),"<%- collection.parentName %>","</a>","</div>",'<div class="title">','<div class="name"><%- collection.name || collection.element_identifier %></div>','<div class="subtitle">','<% if( collection.type === "list" ){ %>',e("a list of datasets"),'<% } else if( collection.type === "paired" ){ %>',e("a pair of datasets"),'<% } else if( collection.type === "list:paired" ){ %>',e("a list of paired datasets"),"<% } %>","</div>","</div>","</div>",'<div class="datasets-list"></div>'].join(""));return{panel:function(j){return i({_l:e,collection:j})}}}());var b=d.extend({DatasetDCEViewClass:f.DatasetDCEListItemView,toString:function(){return"ListCollectionPanel("+((this.model)?(this.model.get("name")):(""))+")"}});var c=b.extend({toString:function(){return"PairCollectionPanel("+((this.model)?(this.model.get("name")):(""))+")"}});var g=d.extend({NestedDCDCEViewClass:f.NestedDCDCEListItemView,toString:function(){return"ListOfPairsCollectionPanel("+((this.model)?(this.model.get("name")):(""))+")"}});return{CollectionPanel:d,ListCollectionPanel:b,PairCollectionPanel:c,ListOfPairsCollectionPanel:g}});
\ No newline at end of file
diff -r 588c521575605b698ee15376f3b919f6a2cda20c -r a94473459ebb4749a375420492d6da9a948ccd3a static/scripts/packed/mvc/dataset/dataset-model.js
--- a/static/scripts/packed/mvc/dataset/dataset-model.js
+++ b/static/scripts/packed/mvc/dataset/dataset-model.js
@@ -1,1 +1,1 @@
-define(["mvc/dataset/states","mvc/base-mvc","utils/localization"],function(a,b,c){var f=b.SearchableModelMixin;var e=Backbone.Model.extend(b.LoggableMixin).extend(b.mixin(f,{defaults:{state:a.NEW,deleted:false,purged:false,name:"(unnamed dataset)",accessible:true,data_type:"",file_ext:"",file_size:0,meta_files:[],misc_blurb:"",misc_info:"",tags:[]},initialize:function(h,g){this.debug("Dataset.initialize",h,g);if(!this.get("accessible")){this.set("state",a.NOT_VIEWABLE)}this.urls=this._generateUrls();this._setUpListeners()},_generateUrls:function(){var i=this.get("id");if(!i){return{}}var h={purge:"datasets/"+i+"/purge_async",display:"datasets/"+i+"/display/?preview=True",edit:"datasets/"+i+"/edit",download:"datasets/"+i+"/display?to_ext="+this.get("file_ext"),report_error:"dataset/errors?id="+i,rerun:"tool_runner/rerun?id="+i,show_params:"datasets/"+i+"/show_params",visualization:"visualization",meta_download:"dataset/get_metadata_file?hda_id="+i+"&metadata_name="};var g=(galaxy_config&&galaxy_config.root)?(galaxy_config.root):("/");_.each(h,function(k,j){h[j]=g+k});this.urls=h;return h},_setUpListeners:function(){this.on("change:state",function(h,g){this.log(this+" has changed state:",h,g);if(this.inReadyState()){this.trigger("state:ready",h,g,this.previous("state"))}});this.on("change:id change:file_ext",function(g){this._generateUrls()})},toJSON:function(){var g=Backbone.Model.prototype.toJSON.call(this);return _.extend(g,{urls:this.urls})},isDeletedOrPurged:function(){return(this.get("deleted")||this.get("purged"))},inReadyState:function(){var g=_.contains(a.READY_STATES,this.get("state"));return(this.isDeletedOrPurged()||g)},hasDetails:function(){return _.has(this.attributes,"genome_build")},hasData:function(){return(this.get("file_size")>0)},"delete":function(g){if(this.get("deleted")){return jQuery.when()}return this.save({deleted:true},g)},undelete:function(g){if(!this.get("deleted")||this.get("purged")){return jQuery.when()}return this.save({deleted:false},g)},purge:function d(g){if(this.get("purged")){return jQuery.when()}g=g||{};g.url=this.urls.purge;var h=this,i=jQuery.ajax(g);i.done(function(l,j,k){h.set({deleted:true,purged:true})});i.fail(function(n,j,m){var k=c("Unable to purge dataset");var l=("Removal of datasets by users is not allowed in this Galaxy instance");if(n.responseJSON&&n.responseJSON.error){k=n.responseJSON.error}else{if(n.responseText.indexOf(l)!==-1){k=l}}n.responseText=k;h.trigger("error",h,n,g,c(k),{error:k})});return i},searchAttributes:["name","file_ext","genome_build","misc_blurb","misc_info","annotation","tags"],searchAliases:{title:"name",format:"file_ext",database:"genome_build",blurb:"misc_blurb",description:"misc_blurb",info:"misc_info",tag:"tags"},toString:function(){var g=this.get("id")||"";if(this.get("name")){g='"'+this.get("name")+'",'+g}return"Dataset("+g+")"}}));return{DatasetAssociation:e}});
\ No newline at end of file
+define(["mvc/dataset/states","mvc/base-mvc","utils/localization"],function(a,b,c){var f=b.SearchableModelMixin;var e=Backbone.Model.extend(b.LoggableMixin).extend(b.mixin(f,{defaults:{state:a.NEW,deleted:false,purged:false,name:"(unnamed dataset)",accessible:true,data_type:"",file_ext:"",file_size:0,meta_files:[],misc_blurb:"",misc_info:"",tags:[]},initialize:function(g,h){this.debug(this+"(Dataset).initialize",g,h);if(!this.get("accessible")){this.set("state",a.NOT_VIEWABLE)}this.urls=this._generateUrls();this._setUpListeners()},_generateUrls:function(){var i=this.get("id");if(!i){return{}}var h={purge:"datasets/"+i+"/purge_async",display:"datasets/"+i+"/display/?preview=True",edit:"datasets/"+i+"/edit",download:"datasets/"+i+"/display?to_ext="+this.get("file_ext"),report_error:"dataset/errors?id="+i,rerun:"tool_runner/rerun?id="+i,show_params:"datasets/"+i+"/show_params",visualization:"visualization",meta_download:"dataset/get_metadata_file?hda_id="+i+"&metadata_name="};var g=(galaxy_config&&galaxy_config.root)?(galaxy_config.root):("/");_.each(h,function(k,j){h[j]=g+k});this.urls=h;return h},_setUpListeners:function(){this.on("change:state",function(h,g){this.log(this+" has changed state:",h,g);if(this.inReadyState()){this.trigger("state:ready",h,g,this.previous("state"))}});this.on("change:id change:file_ext",function(g){this._generateUrls()})},toJSON:function(){var g=Backbone.Model.prototype.toJSON.call(this);return _.extend(g,{urls:this.urls})},isDeletedOrPurged:function(){return(this.get("deleted")||this.get("purged"))},inReadyState:function(){var g=_.contains(a.READY_STATES,this.get("state"));return(this.isDeletedOrPurged()||g)},hasDetails:function(){return _.has(this.attributes,"genome_build")},hasData:function(){return(this.get("file_size")>0)},"delete":function(g){if(this.get("deleted")){return jQuery.when()}return this.save({deleted:true},g)},undelete:function(g){if(!this.get("deleted")||this.get("purged")){return jQuery.when()}return this.save({deleted:false},g)},purge:function d(g){if(this.get("purged")){return jQuery.when()}g=g||{};g.url=this.urls.purge;var h=this,i=jQuery.ajax(g);i.done(function(l,j,k){h.set({deleted:true,purged:true})});i.fail(function(n,j,m){var k=c("Unable to purge dataset");var l=("Removal of datasets by users is not allowed in this Galaxy instance");if(n.responseJSON&&n.responseJSON.error){k=n.responseJSON.error}else{if(n.responseText.indexOf(l)!==-1){k=l}}n.responseText=k;h.trigger("error",h,n,g,c(k),{error:k})});return i},searchAttributes:["name","file_ext","genome_build","misc_blurb","misc_info","annotation","tags"],searchAliases:{title:"name",format:"file_ext",database:"genome_build",blurb:"misc_blurb",description:"misc_blurb",info:"misc_info",tag:"tags"},toString:function(){var g=this.get("id")||"";if(this.get("name")){g='"'+this.get("name")+'",'+g}return"Dataset("+g+")"}}));return{DatasetAssociation:e}});
\ No newline at end of file
diff -r 588c521575605b698ee15376f3b919f6a2cda20c -r a94473459ebb4749a375420492d6da9a948ccd3a static/scripts/packed/mvc/history/history-contents.js
--- a/static/scripts/packed/mvc/history/history-contents.js
+++ b/static/scripts/packed/mvc/history/history-contents.js
@@ -1,1 +1,1 @@
-define(["mvc/history/history-content-model","mvc/history/hda-model","mvc/history/hdca-model","mvc/base-mvc","utils/localization"],function(g,e,b,a,c){var f=Backbone.Collection.extend(a.LoggableMixin).extend({model:function(i,h){if(i.history_content_type==="dataset"){return new e.HistoryDatasetAssociation(i,h)}else{if(i.history_content_type==="dataset_collection"){switch(i.collection_type){case"list":return new b.HistoryListDatasetCollection(i,h);case"paired":return new b.HistoryPairDatasetCollection(i,h);case"list:paired":return new b.HistoryListPairedDatasetCollection(i,h)}throw new TypeError("Unknown collection_type: "+i.collection_type)}}throw new TypeError("Unknown history_content_type: "+i.history_content_type)},initialize:function(i,h){h=h||{};this.historyId=h.historyId;this.on("all",function(){this.debug(this+".event:",arguments)})},urlRoot:galaxy_config.root+"api/histories",url:function(){return this.urlRoot+"/"+this.historyId+"/contents"},ids:function(){return this.map(function(h){return h.get("id")})},notReady:function(){return this.filter(function(h){return !h.inReadyState()})},running:function(){var h=[];this.each(function(j){var i=!j.inReadyState();if(i){h.push(j.get("id"))}});return h},getByHid:function(h){return _.first(this.filter(function(i){return i.get("hid")===h}))},getVisible:function(h,k,j){j=j||[];this.debug("checking isVisible");var i=new f(this.filter(function(l){return l.isVisible(h,k)}));_.each(j,function(l){if(!_.isFunction(l)){return}i=new f(i.filter(l))});return i},haveDetails:function(){return this.all(function(h){return h.hasDetails()})},fetchAllDetails:function(i){i=i||{};var h={details:"all"};i.data=(i.data)?(_.extend(i.data,h)):(h);return this.fetch(i)},ajaxQueue:function(k,j){var i=jQuery.Deferred(),h=this.length,m=[];if(!h){i.resolve([]);return i}var l=this.chain().reverse().map(function(o,n){return function(){var p=k.call(o,j);p.done(function(q){i.notify({curr:n,total:h,response:q,model:o})});p.always(function(q){m.push(q);if(l.length){l.shift()()}else{i.resolve(m)}})}}).value();l.shift()();return i},matches:function(h){return this.filter(function(i){return i.matches(h)})},set:function(j,h){var i=this;j=_.map(j,function(m){var l=m.attributes||m,n=g.typeIdStr(l.history_content_type,l.id),o=i.get(n);if(!o){return m}var k=o.toJSON();_.extend(k,m);return k});Backbone.Collection.prototype.set.call(this,j,h)},promoteToHistoryDatasetCollection:function d(m,k,i){i=i||{};i.url=this.url();i.type="POST";var o=k;var l=[],h=null;if(k==="list"){this.chain().each(function(r){var p=r.attributes.name;var s=r.get("id");var q=r.attributes.history_content_type;if(q==="dataset"){if(o!=="list"){this.log("Invalid collection type")}l.push({name:p,src:"hda",id:s})}else{if(o==="list"){o="list:"+r.attributes.collection_type}else{if(o!=="list:"+r.attributes.collection_type){this.log("Invalid collection type")}}l.push({name:p,src:"hdca",id:s})}});h="New Dataset List"}else{if(k==="paired"){var j=this.ids();if(j.length!==2){}l.push({name:"forward",src:"hda",id:j[0]});l.push({name:"reverse",src:"hda",id:j[1]});h="New Dataset Pair"}}i.data={type:"dataset_collection",name:h,collection_type:o,element_identifiers:JSON.stringify(l)};var n=jQuery.ajax(i);n.done(function(r,p,q){m.refresh()});n.fail(function(r,p,q){if(r.responseJSON&&r.responseJSON.error){error=r.responseJSON.error}else{error=r.responseJSON}r.responseText=error});return n},print:function(){var h=this;h.each(function(i){h.debug(i);if(i.elements){h.debug("\t elements:",i.elements)}})},toString:function(){return(["HistoryContents(",[this.historyId,this.length].join(),")"].join(""))}});return{HistoryContents:f}});
\ No newline at end of file
+define(["mvc/history/history-content-model","mvc/history/hda-model","mvc/history/hdca-model","mvc/base-mvc","utils/localization"],function(g,e,b,a,c){var f=Backbone.Collection.extend(a.LoggableMixin).extend({model:function(i,h){if(i.history_content_type==="dataset"){return new e.HistoryDatasetAssociation(i,h)}else{if(i.history_content_type==="dataset_collection"){switch(i.collection_type){case"list":return new b.HistoryListDatasetCollection(i,h);case"paired":return new b.HistoryPairDatasetCollection(i,h);case"list:paired":return new b.HistoryListPairedDatasetCollection(i,h)}throw new TypeError("Unknown collection_type: "+i.collection_type)}}throw new TypeError("Unknown history_content_type: "+i.history_content_type)},initialize:function(i,h){h=h||{};this.historyId=h.historyId;this.on("all",function(){this.debug(this+".event:",arguments)})},urlRoot:galaxy_config.root+"api/histories",url:function(){return this.urlRoot+"/"+this.historyId+"/contents"},ids:function(){return this.map(function(h){return h.get("id")})},notReady:function(){return this.filter(function(h){return !h.inReadyState()})},running:function(){var h=[];this.each(function(j){var i=!j.inReadyState();if(i){h.push(j.get("id"))}});return h},getByHid:function(h){return _.first(this.filter(function(i){return i.get("hid")===h}))},getVisible:function(h,k,j){j=j||[];this.debug("checking isVisible");var i=new f(this.filter(function(l){return l.isVisible(h,k)}));_.each(j,function(l){if(!_.isFunction(l)){return}i=new f(i.filter(l))});return i},haveDetails:function(){return this.all(function(h){return h.hasDetails()})},fetchAllDetails:function(i){i=i||{};var h={details:"all"};i.data=(i.data)?(_.extend(i.data,h)):(h);return this.fetch(i)},ajaxQueue:function(m,j){var i=jQuery.Deferred(),h=this.length,l=[];if(!h){i.resolve([]);return i}var k=this.chain().reverse().map(function(o,n){return function(){var p=m.call(o,j);p.done(function(q){i.notify({curr:n,total:h,response:q,model:o})});p.always(function(q){l.push(q);if(k.length){k.shift()()}else{i.resolve(l)}})}}).value();k.shift()();return i},matches:function(h){return this.filter(function(i){return i.matches(h)})},set:function(j,h){var i=this;j=_.map(j,function(m){var l=m.attributes||m,n=g.typeIdStr(l.history_content_type,l.id),o=i.get(n);if(!o){return m}var k=o.toJSON();_.extend(k,m);return k});Backbone.Collection.prototype.set.call(this,j,h)},promoteToHistoryDatasetCollection:function d(m,k,i){i=i||{};i.url=this.url();i.type="POST";var o=k;var l=[],h=null;if(k==="list"){this.chain().each(function(r){var p=r.attributes.name;var s=r.get("id");var q=r.attributes.history_content_type;if(q==="dataset"){if(o!=="list"){this.log("Invalid collection type")}l.push({name:p,src:"hda",id:s})}else{if(o==="list"){o="list:"+r.attributes.collection_type}else{if(o!=="list:"+r.attributes.collection_type){this.log("Invalid collection type")}}l.push({name:p,src:"hdca",id:s})}});h="New Dataset List"}else{if(k==="paired"){var j=this.ids();if(j.length!==2){}l.push({name:"forward",src:"hda",id:j[0]});l.push({name:"reverse",src:"hda",id:j[1]});h="New Dataset Pair"}}i.data={type:"dataset_collection",name:h,collection_type:o,element_identifiers:JSON.stringify(l)};var n=jQuery.ajax(i);n.done(function(r,p,q){m.refresh()});n.fail(function(r,p,q){if(r.responseJSON&&r.responseJSON.error){error=r.responseJSON.error}else{error=r.responseJSON}r.responseText=error});return n},print:function(){var h=this;h.each(function(i){h.debug(i);if(i.elements){h.debug("\t elements:",i.elements)}})},toString:function(){return(["HistoryContents(",[this.historyId,this.length].join(),")"].join(""))}});return{HistoryContents:f}});
\ No newline at end of file
diff -r 588c521575605b698ee15376f3b919f6a2cda20c -r a94473459ebb4749a375420492d6da9a948ccd3a static/scripts/packed/mvc/history/history-panel-annotated.js
--- a/static/scripts/packed/mvc/history/history-panel-annotated.js
+++ b/static/scripts/packed/mvc/history/history-panel-annotated.js
@@ -1,1 +1,1 @@
-define(["mvc/history/history-panel","mvc/history/hda-li","utils/localization"],function(e,b,a){var d=e.ReadOnlyHistoryPanel;var c=d.extend({className:"annotated-history-panel",HDAViewClass:b.HDAReadonlyListItemView,renderModel:function(){this.$el.addClass(this.className);var h=d.prototype.renderModel.call(this),f=this.$datasetsList(h),g=$("<table/>").addClass("datasets-list datasets-table");g.append(f.children());f.replaceWith(g);h.find(".history-subtitle").after(this.renderHistoryAnnotation());h.find(".history-search-btn").hide();h.find(".history-controls").after(h.find(".history-search-controls").show());return h},renderHistoryAnnotation:function(){var f=this.model.get("annotation");if(!f){return null}return $(['<div class="history-annotation">',f,"</div>"].join(""))},renderHdas:function(g){g=g||this.$el;var f=d.prototype.renderHdas.call(this,g);this.$datasetsList(g).prepend($("<tr/>").addClass("headers").append([$("<th/>").text(a("Dataset")),$("<th/>").text(a("Annotation"))]));return f},attachContentView:function(i,g){g=g||this.$el;var j=_.find(i.el.classList,function(k){return(/^state\-/).test(k)}),f=i.model.get("annotation")||"",h=$("<tr/>").addClass("dataset-row").append([$("<td/>").addClass("dataset-container").append(i.$el).addClass(j?j.replace("-","-color-"):""),$("<td/>").addClass("additional-info").text(f)]);this.$datasetsList(g).append(h)},events:_.extend(_.clone(d.prototype.events),{"click tr":function(f){$(f.currentTarget).find(".dataset-title-bar").click()},"click .icon-btn":function(f){f.stopPropagation()}}),toString:function(){return"AnnotatedHistoryPanel("+((this.model)?(this.model.get("name")):(""))+")"}});return{AnnotatedHistoryPanel:c}});
\ No newline at end of file
+define(["mvc/history/history-panel","mvc/history/hda-li","utils/localization"],function(e,b,a){var d=e.ReadOnlyHistoryPanel;var c=d.extend({className:"annotated-history-panel",renderModel:function(){this.$el.addClass(this.className);var h=d.prototype.renderModel.call(this),f=this.$datasetsList(h),g=$("<table/>").addClass("datasets-list datasets-table");g.append(f.children());f.replaceWith(g);h.find(".history-subtitle").after(this.renderHistoryAnnotation());h.find(".history-search-btn").hide();h.find(".history-controls").after(h.find(".history-search-controls").show());return h},renderHistoryAnnotation:function(){var f=this.model.get("annotation");if(!f){return null}return $(['<div class="history-annotation">',f,"</div>"].join(""))},renderHdas:function(g){g=g||this.$el;var f=d.prototype.renderHdas.call(this,g);this.$datasetsList(g).prepend($("<tr/>").addClass("headers").append([$("<th/>").text(a("Dataset")),$("<th/>").text(a("Annotation"))]));return f},attachContentView:function(i,g){g=g||this.$el;var j=_.find(i.el.classList,function(k){return(/^state\-/).test(k)}),f=i.model.get("annotation")||"",h=$("<tr/>").addClass("dataset-row").append([$("<td/>").addClass("dataset-container").append(i.$el).addClass(j?j.replace("-","-color-"):""),$("<td/>").addClass("additional-info").text(f)]);this.$datasetsList(g).append(h)},events:_.extend(_.clone(d.prototype.events),{"click tr":function(f){$(f.currentTarget).find(".dataset-title-bar").click()},"click .icon-btn":function(f){f.stopPropagation()}}),toString:function(){return"AnnotatedHistoryPanel("+((this.model)?(this.model.get("name")):(""))+")"}});return{AnnotatedHistoryPanel:c}});
\ No newline at end of file
Repository URL: https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/7e81cbc2603f/
Changeset: 7e81cbc2603f
Branch: stable
User: natefoo
Date: 2014-08-12 15:58:36
Summary: Updated tag latest_2014.08.11 for changeset 7e4d21621ce1
Affected #: 1 file
diff -r 7e4d21621ce12e13ebbdf9fd3259df58c3ef124c -r 7e81cbc2603f0695802ab49dcd65f6dda7b42322 .hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -18,4 +18,4 @@
81fbe25bd02edcd53065e8e4476dd1dfb5a72cf2 latest_2013.11.04
2a756ca2cb1826db7796018e77d12e2dd7b67603 latest_2014.02.10
ca45b78adb4152fc6e7395514d46eba6b7d0b838 release_2014.08.11
-52b5cc75a1757eddfb94ee373193c9d8fa2ec442 latest_2014.08.11
+7e4d21621ce12e13ebbdf9fd3259df58c3ef124c latest_2014.08.11
Repository URL: https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
3 new commits in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/e30d65cf25e8/
Changeset: e30d65cf25e8
Branch: stable
User: BjoernGruening
Date: 2014-08-12 10:33:27
Summary: install_repository_manager do not need trans.app anymore.
Affected #: 1 file
diff -r b6d2c77d8bce44cdaba188ce949ed69f94be6bc4 -r e30d65cf25e8e28677d971c19faaae0eb390e6af lib/galaxy/webapps/galaxy/api/tool_shed_repositories.py
--- a/lib/galaxy/webapps/galaxy/api/tool_shed_repositories.py
+++ b/lib/galaxy/webapps/galaxy/api/tool_shed_repositories.py
@@ -239,8 +239,7 @@
tool_shed_url, name, owner, changeset_revision = self.__parse_repository_from_payload( payload, include_changeset=True )
self.__ensure_can_install_repos( trans )
install_repository_manager = InstallRepositoryManager( trans.app )
- installed_tool_shed_repositories = install_repository_manager.install( trans.app,
- tool_shed_url,
+ installed_tool_shed_repositories = install_repository_manager.install( tool_shed_url,
name,
owner,
changeset_revision,
https://bitbucket.org/galaxy/galaxy-central/commits/fa1a6a494166/
Changeset: fa1a6a494166
Branch: stable
User: BjoernGruening
Date: 2014-08-12 10:38:24
Summary: First argument to __install_repositories is the Tool Shed URL (tool_shed_url)
Affected #: 1 file
diff -r e30d65cf25e8e28677d971c19faaae0eb390e6af -r fa1a6a4941664d9f2cf6dfbb816911778b7c9dcb lib/tool_shed/galaxy_install/install_manager.py
--- a/lib/tool_shed/galaxy_install/install_manager.py
+++ b/lib/tool_shed/galaxy_install/install_manager.py
@@ -694,7 +694,8 @@
name,
owner,
changeset_revision )
- installed_tool_shed_repositories = self.__install_repositories( repository_revision_dict,
+ installed_tool_shed_repositories = self.__install_repositories( tool_shed_url,
+ repository_revision_dict,
repo_info_dicts,
install_options )
return installed_tool_shed_repositories
https://bitbucket.org/galaxy/galaxy-central/commits/7e4d21621ce1/
Changeset: 7e4d21621ce1
Branch: stable
User: BjoernGruening
Date: 2014-08-12 10:41:45
Summary: initiate_repository_installation was not updated in the recent code restructuring efforts
Affected #: 1 file
diff -r fa1a6a4941664d9f2cf6dfbb816911778b7c9dcb -r 7e4d21621ce12e13ebbdf9fd3259df58c3ef124c lib/tool_shed/galaxy_install/install_manager.py
--- a/lib/tool_shed/galaxy_install/install_manager.py
+++ b/lib/tool_shed/galaxy_install/install_manager.py
@@ -789,7 +789,7 @@
# at this point because repository dependencies may have added additional repositories for installation
# along with the single specified repository.
encoded_kwd, query, tool_shed_repositories, encoded_repository_ids = \
- initiate_repository_installation( self.app, installation_dict )
+ self.initiate_repository_installation( installation_dict )
# Some repositories may have repository dependencies that are required to be installed before the
# dependent repository, so we'll order the list of tsr_ids to ensure all repositories install in
# the required order.
Repository URL: https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/2f300953ad98/
Changeset: 2f300953ad98
User: jmchilton
Date: 2014-08-12 15:04:01
Summary: Merged in BjoernGruening/galaxy-central-4 (pull request #454)
Fixes for recent Tool Shed code cleanups
Affected #: 2 files
diff -r 19309418c86450b7f39691460eb430e100883cb4 -r 2f300953ad98992a620b1f0678eb72505f8cdfc2 lib/galaxy/webapps/galaxy/api/tool_shed_repositories.py
--- a/lib/galaxy/webapps/galaxy/api/tool_shed_repositories.py
+++ b/lib/galaxy/webapps/galaxy/api/tool_shed_repositories.py
@@ -239,8 +239,7 @@
tool_shed_url, name, owner, changeset_revision = self.__parse_repository_from_payload( payload, include_changeset=True )
self.__ensure_can_install_repos( trans )
install_repository_manager = InstallRepositoryManager( trans.app )
- installed_tool_shed_repositories = install_repository_manager.install( trans.app,
- tool_shed_url,
+ installed_tool_shed_repositories = install_repository_manager.install( tool_shed_url,
name,
owner,
changeset_revision,
diff -r 19309418c86450b7f39691460eb430e100883cb4 -r 2f300953ad98992a620b1f0678eb72505f8cdfc2 lib/tool_shed/galaxy_install/install_manager.py
--- a/lib/tool_shed/galaxy_install/install_manager.py
+++ b/lib/tool_shed/galaxy_install/install_manager.py
@@ -694,7 +694,8 @@
name,
owner,
changeset_revision )
- installed_tool_shed_repositories = self.__install_repositories( repository_revision_dict,
+ installed_tool_shed_repositories = self.__install_repositories( tool_shed_url,
+ repository_revision_dict,
repo_info_dicts,
install_options )
return installed_tool_shed_repositories
@@ -788,7 +789,7 @@
# at this point because repository dependencies may have added additional repositories for installation
# along with the single specified repository.
encoded_kwd, query, tool_shed_repositories, encoded_repository_ids = \
- initiate_repository_installation( self.app, installation_dict )
+ self.initiate_repository_installation( installation_dict )
# Some repositories may have repository dependencies that are required to be installed before the
# dependent repository, so we'll order the list of tsr_ids to ensure all repositories install in
# the required order.
Repository URL: https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
4 new commits in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/382b019fcdc1/
Changeset: 382b019fcdc1
User: BjoernGruening
Date: 2014-08-12 10:33:27
Summary: install_repository_manager do not need trans.app anymore.
Affected #: 1 file
diff -r 700560884da71e8bd3bdad6ddbe4edfde9566f7f -r 382b019fcdc10b72fc77a9284d7adcfeb3170cd8 lib/galaxy/webapps/galaxy/api/tool_shed_repositories.py
--- a/lib/galaxy/webapps/galaxy/api/tool_shed_repositories.py
+++ b/lib/galaxy/webapps/galaxy/api/tool_shed_repositories.py
@@ -239,8 +239,7 @@
tool_shed_url, name, owner, changeset_revision = self.__parse_repository_from_payload( payload, include_changeset=True )
self.__ensure_can_install_repos( trans )
install_repository_manager = InstallRepositoryManager( trans.app )
- installed_tool_shed_repositories = install_repository_manager.install( trans.app,
- tool_shed_url,
+ installed_tool_shed_repositories = install_repository_manager.install( tool_shed_url,
name,
owner,
changeset_revision,
https://bitbucket.org/galaxy/galaxy-central/commits/0df3fe8e9945/
Changeset: 0df3fe8e9945
User: BjoernGruening
Date: 2014-08-12 10:38:24
Summary: First argument to __install_repositories is the Tool Shed URL (tool_shed_url)
Affected #: 1 file
diff -r 382b019fcdc10b72fc77a9284d7adcfeb3170cd8 -r 0df3fe8e99457c75cefeab162dac3e90f948d764 lib/tool_shed/galaxy_install/install_manager.py
--- a/lib/tool_shed/galaxy_install/install_manager.py
+++ b/lib/tool_shed/galaxy_install/install_manager.py
@@ -694,7 +694,8 @@
name,
owner,
changeset_revision )
- installed_tool_shed_repositories = self.__install_repositories( repository_revision_dict,
+ installed_tool_shed_repositories = self.__install_repositories( tool_shed_url,
+ repository_revision_dict,
repo_info_dicts,
install_options )
return installed_tool_shed_repositories
https://bitbucket.org/galaxy/galaxy-central/commits/f3c84cf5296f/
Changeset: f3c84cf5296f
User: BjoernGruening
Date: 2014-08-12 10:41:45
Summary: initiate_repository_installation was not updated in the recent code restructuring efforts
Affected #: 1 file
diff -r 0df3fe8e99457c75cefeab162dac3e90f948d764 -r f3c84cf5296f6b9bed917f71693ff32dd92188f4 lib/tool_shed/galaxy_install/install_manager.py
--- a/lib/tool_shed/galaxy_install/install_manager.py
+++ b/lib/tool_shed/galaxy_install/install_manager.py
@@ -789,7 +789,7 @@
# at this point because repository dependencies may have added additional repositories for installation
# along with the single specified repository.
encoded_kwd, query, tool_shed_repositories, encoded_repository_ids = \
- initiate_repository_installation( self.app, installation_dict )
+ self.initiate_repository_installation( installation_dict )
# Some repositories may have repository dependencies that are required to be installed before the
# dependent repository, so we'll order the list of tsr_ids to ensure all repositories install in
# the required order.
https://bitbucket.org/galaxy/galaxy-central/commits/2f300953ad98/
Changeset: 2f300953ad98
User: jmchilton
Date: 2014-08-12 15:04:01
Summary: Merged in BjoernGruening/galaxy-central-4 (pull request #454)
Fixes for recent Tool Shed code cleanups
Affected #: 2 files
diff -r 19309418c86450b7f39691460eb430e100883cb4 -r 2f300953ad98992a620b1f0678eb72505f8cdfc2 lib/galaxy/webapps/galaxy/api/tool_shed_repositories.py
--- a/lib/galaxy/webapps/galaxy/api/tool_shed_repositories.py
+++ b/lib/galaxy/webapps/galaxy/api/tool_shed_repositories.py
@@ -239,8 +239,7 @@
tool_shed_url, name, owner, changeset_revision = self.__parse_repository_from_payload( payload, include_changeset=True )
self.__ensure_can_install_repos( trans )
install_repository_manager = InstallRepositoryManager( trans.app )
- installed_tool_shed_repositories = install_repository_manager.install( trans.app,
- tool_shed_url,
+ installed_tool_shed_repositories = install_repository_manager.install( tool_shed_url,
name,
owner,
changeset_revision,
diff -r 19309418c86450b7f39691460eb430e100883cb4 -r 2f300953ad98992a620b1f0678eb72505f8cdfc2 lib/tool_shed/galaxy_install/install_manager.py
--- a/lib/tool_shed/galaxy_install/install_manager.py
+++ b/lib/tool_shed/galaxy_install/install_manager.py
@@ -694,7 +694,8 @@
name,
owner,
changeset_revision )
- installed_tool_shed_repositories = self.__install_repositories( repository_revision_dict,
+ installed_tool_shed_repositories = self.__install_repositories( tool_shed_url,
+ repository_revision_dict,
repo_info_dicts,
install_options )
return installed_tool_shed_repositories
@@ -788,7 +789,7 @@
# at this point because repository dependencies may have added additional repositories for installation
# along with the single specified repository.
encoded_kwd, query, tool_shed_repositories, encoded_repository_ids = \
- initiate_repository_installation( self.app, installation_dict )
+ self.initiate_repository_installation( installation_dict )
# Some repositories may have repository dependencies that are required to be installed before the
# dependent repository, so we'll order the list of tsr_ids to ensure all repositories install in
# the required order.
Repository URL: https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/b6d2c77d8bce/
Changeset: b6d2c77d8bce
Branch: stable
User: natefoo
Date: 2014-08-11 23:22:49
Summary: Added tag latest_2014.08.11 for changeset 52b5cc75a175
Affected #: 1 file
diff -r 52b5cc75a1757eddfb94ee373193c9d8fa2ec442 -r b6d2c77d8bce44cdaba188ce949ed69f94be6bc4 .hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -18,3 +18,4 @@
81fbe25bd02edcd53065e8e4476dd1dfb5a72cf2 latest_2013.11.04
2a756ca2cb1826db7796018e77d12e2dd7b67603 latest_2014.02.10
ca45b78adb4152fc6e7395514d46eba6b7d0b838 release_2014.08.11
+52b5cc75a1757eddfb94ee373193c9d8fa2ec442 latest_2014.08.11
Repository URL: https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.