1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/changeset/12a3c47995d6/
changeset: 12a3c47995d6
user: natefoo
date: 2012-04-03 20:49:28
summary: Warn users against navigating away from Galaxy while uploads are in progress, to prevent interrupting uploads.
affected #: 1 file
diff -r e7420c93edfab1766ec32a0002adee1dec8d30b3 -r 12a3c47995d6269f49b4695fb9acc5c7fbf630a9 templates/base_panels.mako
--- a/templates/base_panels.mako
+++ b/templates/base_panels.mako
@@ -84,6 +84,7 @@
$("iframe#galaxy_main").contents().find("body").find("div[class='errormessage']").text( msg );
}
}
+ var uploads_in_progress = 0;
jQuery( function() {
$("iframe#galaxy_main").load( function() {
$(this).contents().find("form").each( function() {
@@ -134,7 +135,16 @@
$(this).append("<input type='hidden' name='ajax_upload' value='true'>");
}
// iframe submit is required for nginx (otherwise the encoding is wrong)
- $(this).ajaxSubmit( { iframe: true } );
+ $(this).ajaxSubmit( { iframe: true,
+ complete: function (xhr, stat) {
+ uploads_in_progress--;
+ if (uploads_in_progress == 0) {
+ window.onbeforeunload = null;
+ }
+ }
+ } );
+ uploads_in_progress++;
+ window.onbeforeunload = function() { return "Navigating away from the Galaxy analysis interface will interrupt the file upload(s) currently in progress. Do you really want to do this?"; }
if ( $(this).find("input[name='folder_id']").val() != undefined ) {
var library_id = $(this).find("input[name='library_id']").val();
var show_deleted = $(this).find("input[name='show_deleted']").val();
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/changeset/a0f64b544cc6/
changeset: a0f64b544cc6
user: natefoo
date: 2012-04-03 17:55:56
summary: In the DistributedObjectStore, when update_from_file is called with create=True, call DistributedObjectStore.create().
affected #: 1 file
diff -r 8a572a3e1685e58212533c6141714c323bc67159 -r a0f64b544cc6412516a62459808e0026d2897dc0 lib/galaxy/objectstore/__init__.py
--- a/lib/galaxy/objectstore/__init__.py
+++ b/lib/galaxy/objectstore/__init__.py
@@ -963,6 +963,9 @@
return self.__call_method('get_filename', obj, ObjectNotFound, True, **kwargs)
def update_from_file(self, obj, **kwargs):
+ if kwargs.get('create', False):
+ self.create(obj, **kwargs)
+ kwargs['create'] = False
return self.__call_method('update_from_file', obj, ObjectNotFound, True, **kwargs)
def get_object_url(self, obj, **kwargs):
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/changeset/1200112cd51a/
changeset: 1200112cd51a
user: dannon
date: 2012-04-02 22:58:16
summary: Fix inflector for n == 0
affected #: 1 file
diff -r 3f9b7d8a617d60cc319d6e00c485839fc1ec4e6c -r 1200112cd51a35c47b9a35bd055dc4c825983cd5 lib/galaxy/util/inflection.py
--- a/lib/galaxy/util/inflection.py
+++ b/lib/galaxy/util/inflection.py
@@ -14,7 +14,7 @@
def cond_plural(self, number_of_records, word) :
'''Returns the plural form of a word if first parameter is greater than 1'''
- if number_of_records > 1 :
+ if number_of_records != 1:
return self.pluralize(word)
else :
return word
@@ -385,4 +385,4 @@
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# OUT OF OR IN CONNECTION WITH THIS SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THIS SOFTWARE.
\ No newline at end of file
+# THIS SOFTWARE.
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/changeset/2ec5e00abdc5/
changeset: 2ec5e00abdc5
user: greg
date: 2012-04-02 22:16:37
summary: Make sure a valid tool has a guid.
affected #: 1 file
diff -r 080242921d9fb538b280a31260c687a0053a3eb7 -r 2ec5e00abdc56eb3bd0c453cfc5e7707c7aab593 lib/galaxy/util/shed_util.py
--- a/lib/galaxy/util/shed_util.py
+++ b/lib/galaxy/util/shed_util.py
@@ -45,10 +45,11 @@
if 'tools' in metadata:
tool_dicts = metadata[ 'tools' ]
for tool_dict in tool_dicts:
- guid = tool_dict[ 'guid' ]
- if guid not in processed_guids:
- valid_tools += 1
- processed_guids.append( guid )
+ if 'guid' in tool_dict:
+ guid = tool_dict[ 'guid' ]
+ if guid not in processed_guids:
+ valid_tools += 1
+ processed_guids.append( guid )
processed_repository_ids.append( repository.id )
return valid_tools
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.