commit/galaxy-central: 2 new changesets
2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/97d020901403/ Changeset: 97d020901403 Branch: stable User: carlfeberhard Date: 2013-09-09 17:20:40 Summary: Fix to dbkey select in library upload when 'unspecified' is not in dbkey list Affected #: 1 file diff -r 9fe9aa6ac504bc7703ba5d465e68170d79e89905 -r 97d0209014039d0f9aaa7f48a188708de1829786 templates/webapps/galaxy/library/common/common.mako --- a/templates/webapps/galaxy/library/common/common.mako +++ b/templates/webapps/galaxy/library/common/common.mako @@ -275,8 +275,9 @@ # move unspecified to the first option and set as default if not last_used_build #TODO: remove when we decide on a common dbkey selector widget unspecified = ('unspecified (?)', '?') - dbkeys.remove( unspecified ) - dbkeys.insert( 0, unspecified ) + if unspecified in dbkeys: + dbkeys.remove( unspecified ) + dbkeys.insert( 0, unspecified ) default_selected = last_used_build or '?' %> %for dbkey in dbkeys: https://bitbucket.org/galaxy/galaxy-central/commits/b62b2b4daeac/ Changeset: b62b2b4daeac User: carlfeberhard Date: 2013-09-09 17:21:06 Summary: Merge stable Affected #: 1 file diff -r 354fb3e262bbf08cf5b77f70da1bb45ee947841c -r b62b2b4daeacc819016d6208078fa1fdd5b467c4 templates/webapps/galaxy/library/common/common.mako --- a/templates/webapps/galaxy/library/common/common.mako +++ b/templates/webapps/galaxy/library/common/common.mako @@ -275,8 +275,9 @@ # move unspecified to the first option and set as default if not last_used_build #TODO: remove when we decide on a common dbkey selector widget unspecified = ('unspecified (?)', '?') - dbkeys.remove( unspecified ) - dbkeys.insert( 0, unspecified ) + if unspecified in dbkeys: + dbkeys.remove( unspecified ) + dbkeys.insert( 0, unspecified ) default_selected = last_used_build or '?' %> %for dbkey in dbkeys: 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.
participants (1)
-
commits-noreply@bitbucket.org