1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/changeset/de28eda68d0c/
changeset: de28eda68d0c
user: dan
date: 2012-04-12 20:14:45
summary: Fix two more places where filenames in content-dispositions were not being surrounded by quotes.
affected #: 2 files
diff -r 84d49e39069d965a45097ade1b71a57cdc0a0386 -r de28eda68d0c40f1a71c5ebf95e06cb816dc890b lib/galaxy/web/controllers/root.py
--- a/lib/galaxy/web/controllers/root.py
+++ b/lib/galaxy/web/controllers/root.py
@@ -250,7 +250,7 @@
valid_chars = '.,^_-()[]0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
fname = data.name
fname = ''.join(c in valid_chars and c or '_' for c in fname)[0:150]
- trans.response.headers["Content-Disposition"] = "attachment; filename=GalaxyHistoryItem-%s-[%s]%s" % (data.hid, fname, toext)
+ trans.response.headers["Content-Disposition"] = 'attachment; filename="GalaxyHistoryItem-%s-[%s]%s"' % (data.hid, fname, toext)
trans.log_event( "Display dataset id: %s" % str(id) )
try:
return open( data.file_name )
diff -r 84d49e39069d965a45097ade1b71a57cdc0a0386 -r de28eda68d0c40f1a71c5ebf95e06cb816dc890b lib/galaxy/web/controllers/workflow.py
--- a/lib/galaxy/web/controllers/workflow.py
+++ b/lib/galaxy/web/controllers/workflow.py
@@ -1109,7 +1109,7 @@
valid_chars = '.,^_-()[]0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
sname = stored.name
sname = ''.join(c in valid_chars and c or '_' for c in sname)[0:150]
- trans.response.headers["Content-Disposition"] = "attachment; filename=Galaxy-Workflow-%s.ga" % ( sname )
+ trans.response.headers["Content-Disposition"] = 'attachment; filename="Galaxy-Workflow-%s.ga"' % ( sname )
trans.response.set_content_type( 'application/galaxy-archive' )
return stored_dict
@web.expose
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/bb7f51fb545d/
changeset: bb7f51fb545d
user: dannon
date: 2012-04-11 18:03:51
summary: Tabular dataset display - Remove logs, revert scroll detection to base.
affected #: 1 file
diff -r ff62ddc66b1a454e9b3ba11297c0bd8e2a74dc8d -r bb7f51fb545d0517eeceb902fa83dc5a659c64df templates/dataset/tabular_chunked.mako
--- a/templates/dataset/tabular_chunked.mako
+++ b/templates/dataset/tabular_chunked.mako
@@ -39,11 +39,7 @@
$(document).ready(function(){
fillTable();
$(window).scroll(function(){
- console.log($(window).scrollTop());
- console.log($(document).height());
- console.log($(window).height());
- // if ($(window).scrollTop() == $(document).height() - $(window).height()){
- if ($(document).height() - $(window).scrollTop() <= $(window).height()){
+ if ($(window).scrollTop() == $(document).height() - $(window).height()){
fillTable();
}
});
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/60061d1a3696/
changeset: 60061d1a3696
user: jgoecks
date: 2012-04-11 17:37:08
summary: Move tools controller from UI controller to an API controller and add show method for tool.
affected #: 3 files
diff -r 423f4f2910ac90098e799d354a2936513242a21e -r 60061d1a369635facf858766c7a992272b806750 lib/galaxy/web/api/tools.py
--- /dev/null
+++ b/lib/galaxy/web/api/tools.py
@@ -0,0 +1,32 @@
+from galaxy import config, tools, web, util
+from galaxy.web.base.controller import BaseController, BaseAPIController
+
+class ToolsController( BaseAPIController ):
+ """
+ RESTful controller for interactions with tools.
+ """
+
+ @web.json
+ def index( self, trans, **kwds ):
+ """
+ GET /api/tools: returns a list of tools defined by parameters
+ parameters:
+ in_panel - if true, tools are returned in panel structure, including sections and labels
+ trackster - if true, only tools that are compatible with Trackster are returned
+ """
+
+ # Read params.
+ in_panel = util.string_as_bool( kwds.get( 'in_panel', 'True' ) )
+ trackster = util.string_as_bool( kwds.get( 'trackster', 'False' ) )
+
+ # Create return value.
+ return self.app.toolbox.to_dict( trans, in_panel=in_panel, trackster=trackster )
+
+ @web.expose_api
+ def show( self, trans, id, **kwd ):
+ """
+ GET /api/tools/{tool_id}
+ Returns tool information, including parameters and inputs.
+ """
+ return self.app.toolbox.tools_by_id[ id ].to_dict( trans, all=True )
+
\ No newline at end of file
diff -r 423f4f2910ac90098e799d354a2936513242a21e -r 60061d1a369635facf858766c7a992272b806750 lib/galaxy/web/buildapp.py
--- a/lib/galaxy/web/buildapp.py
+++ b/lib/galaxy/web/buildapp.py
@@ -129,6 +129,7 @@
webapp.api_mapper.resource( 'request_type', 'request_types', path_prefix='/api' )
webapp.api_mapper.resource( 'role', 'roles', path_prefix='/api' )
webapp.api_mapper.resource_with_deleted( 'quota', 'quotas', path_prefix='/api' )
+ webapp.api_mapper.resource( 'tool', 'tools', path_prefix='/api' )
webapp.api_mapper.resource_with_deleted( 'user', 'users', path_prefix='/api' )
webapp.api_mapper.resource( 'workflow', 'workflows', path_prefix='/api' )
webapp.api_mapper.resource_with_deleted( 'history', 'histories', path_prefix='/api' )
diff -r 423f4f2910ac90098e799d354a2936513242a21e -r 60061d1a369635facf858766c7a992272b806750 lib/galaxy/web/controllers/tools.py
--- a/lib/galaxy/web/controllers/tools.py
+++ /dev/null
@@ -1,26 +0,0 @@
-from galaxy import config, tools, web, util
-from galaxy.web.base.controller import BaseController, BaseUIController
-
-class ToolsController( BaseUIController ):
- """
- RESTful controller for interactions with tools. Once session-based
- authentication can be done with API controllers, this will be moved
- to be part of the API.
- """
-
- @web.json
- def index( self, trans, **kwds ):
- """
- GET /api/tools: returns a list of tools defined by parameters
- parameters:
- in_panel - if true, tools are returned in panel structure, including sections and labels
- trackster - if true, only tools that are compatible with Trackster are returned
- """
-
- # Read params.
- in_panel = util.string_as_bool( kwds.get( 'in_panel', 'True' ) )
- trackster = util.string_as_bool( kwds.get( 'trackster', 'False' ) )
-
- # Create return value.
- return self.app.toolbox.to_dict( trans, in_panel=in_panel, trackster=trackster )
-
\ No newline at end of file
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.