1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/f44f6beea3da/
Changeset: f44f6beea3da
User: jgoecks
Date: 2013-04-30 20:36:20
Summary: Clean up for copying datasets to current history.
Affected #: 1 file
diff -r 4c7b5f4d569d478fd83fbfa3bf8d2f0187a30c1a -r f44f6beea3daf77bd48fdb8a657f7cb593b72b6f lib/galaxy/webapps/galaxy/controllers/dataset.py
--- a/lib/galaxy/webapps/galaxy/controllers/dataset.py
+++ b/lib/galaxy/webapps/galaxy/controllers/dataset.py
@@ -546,8 +546,14 @@
hda_ids = [ trans.security.encode_id( hda.id ) for hda in hdas ]
trans.template_context[ 'seek_hda_ids' ] = hda_ids
elif operation == "copy to current history":
- # Copy a dataset to the current history.
+ #
+ # Copy datasets to the current history.
+ #
+
target_histories = [ trans.get_history() ]
+
+ # Reverse HDAs so that they appear in the history in the order they are provided.
+ hda_ids.reverse()
status, message = self._copy_datasets( trans, hda_ids, target_histories )
# Current history changed, refresh history frame.
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/4c7b5f4d569d/
Changeset: 4c7b5f4d569d
User: jgoecks
Date: 2013-04-30 20:15:27
Summary: Clean up for inheritance chain display.
Affected #: 1 file
diff -r 3a6d4a323e3ae7764a6a3704cf35b9dcb9b315f2 -r 4c7b5f4d569d478fd83fbfa3bf8d2f0187a30c1a templates/show_params.mako
--- a/templates/show_params.mako
+++ b/templates/show_params.mako
@@ -153,7 +153,9 @@
<div class="inherit" style="background-color: #fff; font-weight:bold;">${hda.name | h}</div>
% for dep in inherit_chain:
- <div style="font-size: 36px; text-align: center;">↑</div>
- <div class="inherit">${dep[0].name | h}<br/>${dep[1]}</div>
+ <div style="font-size: 36px; text-align: center; position: relative; top: 3px">↑</div>
+ <div class="inherit">
+ '${dep[0].name | h}' in ${dep[1]}<br/>
+ </div>
% endfor
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/07f09e119bfc/
Changeset: 07f09e119bfc
User: inithello
Date: 2013-04-30 19:41:26
Summary: Update check strings in functional tests to reflect recent changes to the UI.
Affected #: 1 file
diff -r 6b996d66ce37e20de68d6f02f32355c026a5324b -r 07f09e119bfcbe8e4cfda3400c8892f8fb3891d2 test/tool_shed/functional/test_0000_basic_repository_features.py
--- a/test/tool_shed/functional/test_0000_basic_repository_features.py
+++ b/test/tool_shed/functional/test_0000_basic_repository_features.py
@@ -118,14 +118,17 @@
self.logout()
self.login( email=common.test_user_1_email, username=common.test_user_1_name )
self.set_repository_deprecated( repository,
- strings_displayed=[ 'has been marked as deprecated', 'Mark as not deprecated' ] )
+ strings_displayed=[ 'has been marked as deprecated' ] )
+ strings_displayed = [ 'This repository has been marked as deprecated', 'Mark repository as not deprecated' ]
self.display_manage_repository_page( repository,
- strings_displayed=[ 'This repository has been marked as deprecated' ],
+ strings_displayed=strings_displayed,
strings_not_displayed=[ 'Upload files', 'Reset all repository metadata' ] )
self.browse_repository( repository, strings_not_displayed=[ 'Upload files' ] )
self.set_repository_deprecated( repository,
- strings_displayed=[ 'has been marked as not deprecated', 'Mark as deprecated' ],
+ strings_displayed=[ 'has been marked as not deprecated' ],
set_deprecated=False )
+ strings_displayed = [ 'Mark repository as deprecated', 'Upload files', 'Reset all repository metadata' ]
+ self.display_manage_repository_page( repository, strings_displayed=strings_displayed )
def test_0045_display_repository_tip_file( self ):
'''Display the contents of filtering.xml in the repository tip revision'''
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/f8d07c988129/
Changeset: f8d07c988129
User: greg
Date: 2013-04-29 23:09:44
Summary: Add more granular lists of writable repositories for the current user: repositories with missing tool test components, repositories with failing tool tests and repositories with no failing tool tests.
Affected #: 8 files
diff -r 8264c77e4f07c0dee932add796f5ee7ce02245b3 -r f8d07c98812903dc98de2665874a2c31b65b84da lib/galaxy/webapps/tool_shed/buildapp.py
--- a/lib/galaxy/webapps/tool_shed/buildapp.py
+++ b/lib/galaxy/webapps/tool_shed/buildapp.py
@@ -77,19 +77,19 @@
# Add the web API. # A good resource for RESTful services - http://routes.readthedocs.org/en/latest/restful.html
webapp.add_api_controllers( 'galaxy.webapps.tool_shed.api', app )
webapp.mapper.resource( 'repository',
- 'repositories',
- controller='repositories',
- collection={ 'get_repository_revision_install_info' : 'GET',
- 'get_ordered_installable_revisions' : 'GET' },
- name_prefix='repository_',
- path_prefix='/api',
- parent_resources=dict( member_name='repository', collection_name='repositories' ) )
+ 'repositories',
+ controller='repositories',
+ collection={ 'get_repository_revision_install_info' : 'GET',
+ 'get_ordered_installable_revisions' : 'GET' },
+ name_prefix='repository_',
+ path_prefix='/api',
+ parent_resources=dict( member_name='repository', collection_name='repositories' ) )
webapp.mapper.resource( 'repository_revision',
- 'repository_revisions',
- controller='repository_revisions',
- name_prefix='repository_revision_',
- path_prefix='/api',
- parent_resources=dict( member_name='repository_revision', collection_name='repository_revisions' ) )
+ 'repository_revisions',
+ controller='repository_revisions',
+ name_prefix='repository_revision_',
+ path_prefix='/api',
+ parent_resources=dict( member_name='repository_revision', collection_name='repository_revisions' ) )
webapp.finalize_config()
# Wrap the webapp in some useful middleware
if kwargs.get( 'middleware', True ):
This diff is so big that we needed to truncate the remainder.
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.