1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/changeset/9deeb2fec661/
changeset: 9deeb2fec661
user: james_taylor
date: 2012-09-17 21:41:35
summary: trackster: fix adding bookmarks
affected #: 1 file
diff -r 36f7e3a78eb1c670332916afef78b33b805bcd79 -r 9deeb2fec6612253de699cc7207ffba09775c88b templates/tracks/browser.mako
--- a/templates/tracks/browser.mako
+++ b/templates/tracks/browser.mako
@@ -36,6 +36,8 @@
});
require( ["viz/trackster_ui","viz/trackster/util","viz/trackster/tracks"], function( trackster_ui, util, tracks ) {
+ var add_bookmark = trackster_ui.add_bookmark
+
//
// Place URLs here so that url_for can be used to generate them.
//
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/36f7e3a78eb1/
changeset: 36f7e3a78eb1
user: james_taylor
date: 2012-09-17 21:38:46
summary: trackster: fix groups
affected #: 1 file
diff -r bba6f86ff735d9cc8e09c56383eeef84b2ac0303 -r 36f7e3a78eb1c670332916afef78b33b805bcd79 templates/tracks/browser.mako
--- a/templates/tracks/browser.mako
+++ b/templates/tracks/browser.mako
@@ -34,7 +34,7 @@
"libs/underscore": { exports: "_" }
}
});
- require( ["viz/trackster_ui","viz/trackster/util"], function( trackster_ui, util ) {
+ require( ["viz/trackster_ui","viz/trackster/util","viz/trackster/tracks"], function( trackster_ui, util, tracks ) {
//
// Place URLs here so that url_for can be used to generate them.
@@ -113,7 +113,7 @@
});
} },
{ icon_class: 'block--plus', title: 'Add group', on_click: function() {
- view.add_drawable( new DrawableGroup(view, view, { name: "New Group" }) );
+ view.add_drawable( new tracks.DrawableGroup(view, view, { name: "New Group" }) );
} },
{ icon_class: 'bookmarks', title: 'Bookmarks', on_click: function() {
// HACK -- use style to determine if panel is hidden and hide/show accordingly.
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/9afd6804c8be/
changeset: 9afd6804c8be
user: dannon
date: 2012-09-17 19:19:32
summary: Set header 'X-Content-Type-Options: nosniff' for dataset display. This will prevent IE8 from trying to render as html datasets served as text/plain.
affected #: 1 file
diff -r 81b2a6d001dcf2121bf38244775419596fa669bd -r 9afd6804c8be7f4360f41c1b71e3c77e8f71b756 lib/galaxy/datatypes/data.py
--- a/lib/galaxy/datatypes/data.py
+++ b/lib/galaxy/datatypes/data.py
@@ -288,6 +288,9 @@
#Relocate all composite datatype display to a common location.
composite_extensions = trans.app.datatypes_registry.get_composite_extensions( )
composite_extensions.append('html') # for archiving composite datatypes
+ #Prevent IE8 from sniffing content type since we're explicit about it. This prevents intentionally text/plain
+ #content from being rendered in the browser
+ trans.response.headers['X-Content-Type-Options'] = 'nosniff'
if isinstance( data, basestring ):
return data
if filename and filename != "index":
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/80bd52837f23/
changeset: 80bd52837f23
user: natefoo
date: 2012-09-17 18:47:13
summary: Fix a typo in library permissions check.
affected #: 1 file
diff -r 08f1d09a65a98977817ca1f1bd34fc266d61aa24 -r 80bd52837f23ba3873c8ed3d029086f739926874 lib/galaxy/web/base/controller.py
--- a/lib/galaxy/web/base/controller.py
+++ b/lib/galaxy/web/base/controller.py
@@ -232,7 +232,7 @@
raise ItemOwnershipException( "%s is not owned by the current user" % item.__class__.__name__, type='error' )
if check_accessible:
if type( item ) in ( trans.app.model.LibraryFolder, trans.app.model.LibraryDatasetDatasetAssociation, trans.app.model.LibraryDataset ):
- if not ( trans.user_is_admin() or trans.app.security_agent.can_access_library_i9tem( trans.get_current_user_roles(), item, trans.user ) ):
+ if not ( trans.user_is_admin() or trans.app.security_agent.can_access_library_item( trans.get_current_user_roles(), item, trans.user ) ):
raise ItemAccessibilityException( "%s is not accessible to the current user" % item.__class__.__name__, type='error' )
else:
# Verify accessible.
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.