1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/changeset/6b635cb8191d/
changeset: 6b635cb8191d
user: jgoecks
date: 2012-01-17 15:05:11
summary: Update functional tests to be compatible with 0d1d62b8be2e
affected #: 2 files
diff -r 2272101e8c292bd33e78cdcee37bac4a62cd5cb4 -r 6b635cb8191d0ce91e60f8e2cc5ec1606b1c1720 test/base/twilltestcase.py
--- a/test/base/twilltestcase.py
+++ b/test/base/twilltestcase.py
@@ -831,12 +831,12 @@
previously_created = True
except:
try:
- self.check_page_for_string( 'This user name is not available' )
+ self.check_page_for_string( 'Public name is taken; please choose another' )
username_taken = True
except:
try:
# Note that we're only checking if the usr name is >< 4 chars here...
- self.check_page_for_string( 'User name must be at least 4 characters in length' )
+ self.check_page_for_string( 'Public name must be at least 4 characters in length' )
invalid_username = True
except:
pass
@@ -1218,12 +1218,12 @@
previously_created = True
except:
try:
- self.check_page_for_string( 'This user name is not available' )
+ self.check_page_for_string( 'Public name is taken; please choose another' )
username_taken = True
except:
try:
# Note that we're only checking if the usr name is >< 4 chars here...
- self.check_page_for_string( 'User name must be at least 4 characters in length' )
+ self.check_page_for_string( 'Public name must be at least 4 characters in length' )
invalid_username = True
except:
pass
diff -r 2272101e8c292bd33e78cdcee37bac4a62cd5cb4 -r 6b635cb8191d0ce91e60f8e2cc5ec1606b1c1720 test/functional/test_admin_features.py
--- a/test/functional/test_admin_features.py
+++ b/test/functional/test_admin_features.py
@@ -32,7 +32,7 @@
webapp='galaxy',
referer='' )
if not username_taken:
- raise AssertionError, "The user name (%s) is already being used by another user, but no error was displayed" \
+ raise AssertionError, "The public name (%s) is already being used by another user, but no error was displayed" \
% 'admin-user'
# Test setting the user name to an invalid one. Note that the account must not exist in order
# for this test to work as desired, so the email we're passing is important...
@@ -42,7 +42,7 @@
webapp='galaxy',
referer='' )
if not invalid_username:
- raise AssertionError, "The user name (%s) is is invalid, but no error was displayed" % username
+ raise AssertionError, "The public name (%s) is is invalid, but no error was displayed" % username
previously_created, username_taken, invalid_username = self.create_new_account_as_admin( email=email,
password=password,
username='regular-user3',
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/2272101e8c29/
changeset: 2272101e8c29
user: jgoecks
date: 2012-01-17 04:40:13
summary: Subset GFF datasets correctly when running tools in Trackster.
affected #: 1 file
diff -r ec85ba64a5b751f53c2288fdbd27ae228a8d89c3 -r 2272101e8c292bd33e78cdcee37bac4a62cd5cb4 lib/galaxy/visualization/tracks/data_providers.py
--- a/lib/galaxy/visualization/tracks/data_providers.py
+++ b/lib/galaxy/visualization/tracks/data_providers.py
@@ -857,7 +857,7 @@
reader = GFFReaderWrapper( source, fix_strand=True )
feature = reader.next()
for interval in feature.intervals:
- out.write(interval.raw_line + '\n')
+ out.write( '\t'.join( interval.fields ) + '\n' )
out.close()
def get_iterator( self, chrom, start, end ):
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/ec85ba64a5b7/
changeset: ec85ba64a5b7
user: jgoecks
date: 2012-01-16 23:36:04
summary: Trackster: true replacement of a track with a group when running a tool.
affected #: 1 file
diff -r a5703335e20544613416329c2fbd2a5c7af965e4 -r ec85ba64a5b751f53c2288fdbd27ae228a8d89c3 static/scripts/trackster.js
--- a/static/scripts/trackster.js
+++ b/static/scripts/trackster.js
@@ -974,9 +974,8 @@
if (update_html) {
old_drawable.container_div.replaceWith(new_drawable.container_div);
}
- return true;
- }
- return false;
+ }
+ return index;
},
/**
* Remove drawable from this collection.
@@ -1839,18 +1838,13 @@
// Create new group.
var group = new DrawableGroup(this.name, this.track.view);
+ // Replace track with group.
+ var index = current_track.container.replace_drawable(current_track, group, false);
+
+ // Update HTML.
// FIXME: this is ugly way to replace a track with a group -- make this easier via
// a Drawable or DrawableCollection function.
- // NOTE: doing this:
- // current_track.container.replace_drawable(current_track, group, true);
- // causes problems with sliders, so it's not used right now.
-
- // Add group to view.
- current_track.view.add_drawable(group);
- current_track.view.content_div.append(group.container_div);
-
- // Move track from view to group.
- current_track.container.remove_drawable(current_track);
+ group.container_div.insertBefore(current_track.view.content_div.children()[index]);
group.add_drawable(current_track);
current_track.container_div.appendTo(group.content_div);
container = group;
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/a8b733b58fec/
changeset: a8b733b58fec
user: natefoo
date: 2012-01-16 18:38:03
summary: Avoid annoying errors produced by the Googlebot hitting the import library datasets to history page (it doesn't have a history).
affected #: 1 file
diff -r 096f4040e90d3516c8ad6093f4e2fcd618c43f6b -r a8b733b58fec15f2aa664eb2b3f7e72e10b622bc lib/galaxy/web/controllers/library_common.py
--- a/lib/galaxy/web/controllers/library_common.py
+++ b/lib/galaxy/web/controllers/library_common.py
@@ -1956,7 +1956,12 @@
# to the lddas in order for the menu optin to be available.
ldda = trans.sa_session.query( trans.model.LibraryDatasetDatasetAssociation ).get( ldda_id )
source_lddas.append( ldda )
- target_histories = [ current_history ]
+ if current_history is not None:
+ target_histories = [ current_history ]
+ else:
+ target_histories = []
+ message = 'You must have a history before you can import datasets. You can do this by <a href="%s" target="_top">loading the analysis interface</a>.' % url_for(controller='root')
+ status = 'error'
if user:
target_histories = user.active_histories
if action == 'import_to_current_history' and library_id:
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/e2ac92093afd/
changeset: e2ac92093afd
user: jgoecks
date: 2012-01-13 22:22:29
summary: Add href to trackster icons in history pane so that browser treats it as a URL and not an anchor.
affected #: 1 file
diff -r a5e1ad623f390f1daceaa21aaa52868b4ce50c30 -r e2ac92093afda6743ea68766be96c9c7a454568d templates/root/history_common.mako
--- a/templates/root/history_common.mako
+++ b/templates/root/history_common.mako
@@ -220,7 +220,7 @@
else:
data_url = h.url_for( controller='tracks', action='list_tracks' )
%>
- <a data-url="${data_url}" class="icon-button chart_curve tooltip trackster-add"
+ <a href="javascript:void(0)" data-url="${data_url}" class="icon-button chart_curve tooltip trackster-add"
action-url="${h.url_for( controller='tracks', action='browser', dataset_id=dataset_id)}"
new-url="${h.url_for( controller='tracks', action='index', dataset_id=dataset_id, default_dbkey=data.dbkey)}" title="View in Trackster"></a>
%endif
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.