1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/b67a59a2beca/
Changeset: b67a59a2beca
User: carlfeberhard
Date: 2014-04-29 19:21:56
Summary: History options: have 'Purge deleted datasets' update the user disk size
Affected #: 1 file
diff -r b526afe822e53ce530fabe94dff683818a33b29a -r b67a59a2beca5072eb19ad7c7e20beb40adda8da templates/webapps/galaxy/root/index.mako
--- a/templates/webapps/galaxy/root/index.mako
+++ b/templates/webapps/galaxy/root/index.mako
@@ -17,9 +17,6 @@
<%def name="javascripts()">
${parent.javascripts()}
${tool_menu_javascripts()}
- ${h.js(
- "utils/LazyDataLoader"
- )}
</%def><%def name="late_javascripts()">
@@ -95,6 +92,10 @@
"${_("Purge Deleted Datasets")}": function() {
if ( confirm( "Really delete all deleted datasets permanently? This cannot be undone." ) ) {
galaxy_main.location = "${h.url_for( controller='history', action='purge_deleted_datasets' )}";
+ // update the user disk size when the purge page loads
+ $( '#galaxy_main' ).load( function(){
+ Galaxy.user.fetch();
+ })
}
},
"${_("Show Structure")}": function() {
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/5846eb77fc8e/
Changeset: 5846eb77fc8e
User: greg
Date: 2014-04-29 15:34:58
Summary: Fix for determining the list of all repository dependency dictionaries when installing a repository into Galaxy that has a deep dependency hierarchy.
Affected #: 1 file
diff -r e3808d426ef2387a25aa79cbba397a6ec2f0d8f5 -r 5846eb77fc8e7b49fe1cafd986e709974ec1ae87 lib/tool_shed/util/common_install_util.py
--- a/lib/tool_shed/util/common_install_util.py
+++ b/lib/tool_shed/util/common_install_util.py
@@ -464,7 +464,15 @@
all_required_repo_info_dict[ k ] = v
if required_repo_info_dicts:
for required_repo_info_dict in required_repo_info_dicts:
- if required_repo_info_dict not in all_repo_info_dicts:
+ # Each required_repo_info_dict has a single entry, and all_repo_info_dicts is a list
+ # of dictionaries, each of which has a single entry. We'll check keys here rather than
+ # the entire dictionary because a dictionary entry in all_repo_info_dicts will include
+ # lists of discovered repository dependencies, but these lists will be empty in the
+ # required_repo_info_dict since dependency discovery has not yet been performed for these
+ # dictionaries.
+ required_repo_infor_dict_key = required_repo_info_dict.keys()[ 0 ]
+ all_repo_info_dicts_keys = [ d.keys()[ 0 ] for d in all_repo_info_dicts ]
+ if required_repo_infor_dict_key not in all_repo_info_dicts_keys:
all_repo_info_dicts.append( required_repo_info_dict )
all_required_repo_info_dict[ 'all_repo_info_dicts' ] = all_repo_info_dicts
return all_required_repo_info_dict
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/e3808d426ef2/
Changeset: e3808d426ef2
User: greg
Date: 2014-04-28 21:58:48
Summary: Handle changing http protocols in the tool shed registry's password_manager_for_url() function.
Affected #: 1 file
diff -r 04befb2eb25baa347a3f440ed22045d01e75ebc7 -r e3808d426ef2387a25aa79cbba397a6ec2f0d8f5 lib/tool_shed/tool_shed_registry.py
--- a/lib/tool_shed/tool_shed_registry.py
+++ b/lib/tool_shed/tool_shed_registry.py
@@ -2,6 +2,7 @@
import sys
import urllib2
from galaxy.util.odict import odict
+from tool_shed.util import common_util
from tool_shed.util import xml_util
log = logging.getLogger( __name__ )
@@ -39,13 +40,17 @@
def password_manager_for_url( self, url ):
"""
- If the tool shed is using external auth, the client to the tool shed must authenticate to that as well. This provides access to the
- urllib2.HTTPPasswordMgrWithdefaultRealm() object for the url passed in.
+ If the tool shed is using external auth, the client to the tool shed must authenticate to that
+ as well. This provides access to the urllib2.HTTPPasswordMgrWithdefaultRealm() object for the
+ url passed in.
- Following more what galaxy.demo_sequencer.controllers.common does might be more appropriate at some stage...
+ Following more what galaxy.demo_sequencer.controllers.common does might be more appropriate at
+ some stage...
"""
+ url_sans_protocol = common_util.remove_protocol_from_tool_shed_url( url )
for shed_name, shed_url in self.tool_sheds.items():
- if shed_url.find( url ) >= 0:
+ shed_url_sans_protocol = common_util.remove_protocol_from_tool_shed_url( shed_url )
+ if shed_url_sans_protocol.find( url_sans_protocol ) >= 0:
return self.tool_sheds_auth[ shed_name ]
log.debug( "Invalid url '%s' received by tool shed registry's password_manager_for_url method." % str( url ) )
return None
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.