1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/221ecd7caba6/
Changeset: 221ecd7caba6
User: greg
Date: 2013-09-30 19:29:05
Summary: Invalid tools contained in repositories can only be loaded in the tool shed, so display the container label accordingly.
Affected #: 1 file
diff -r 4bcc5a236dc5d337ddeab616e32b908b8deea325 -r 221ecd7caba6d0196320f508aa1389b757997ab7 templates/webapps/tool_shed/repository/common.mako
--- a/templates/webapps/tool_shed/repository/common.mako
+++ b/templates/webapps/tool_shed/repository/common.mako
@@ -276,7 +276,8 @@
else:
folder_label = "%s<i> - click the name to preview the tool and use the pop-up menu to inspect all metadata</i>" % folder_label
elif folder.invalid_tools:
- folder_label = "%s<i> - click the tool config file name to see why the tool is invalid</i>" % folder_label
+ if trans.webapp.name == 'tool_shed':
+ folder_label = "%s<i> - click the tool config file name to see why the tool is invalid</i>" % folder_label
elif folder.tool_dependencies:
if folder.description:
folder_label = "%s<i> - %s</i>" % ( folder_label, folder.description )
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/4bcc5a236dc5/
Changeset: 4bcc5a236dc5
User: greg
Date: 2013-09-30 17:13:48
Summary: Remove the string "tooltip" from the "icon-button" class style on the "Manage installed tool shed repositories" grid since using it now eliminates display of the image.
Affected #: 1 file
diff -r 57ffe706cc184c630fdf957c5f93b76cb09ac94d -r 4bcc5a236dc5d337ddeab616e32b908b8deea325 lib/tool_shed/galaxy_install/grids/admin_toolshed_grids.py
--- a/lib/tool_shed/galaxy_install/grids/admin_toolshed_grids.py
+++ b/lib/tool_shed/galaxy_install/grids/admin_toolshed_grids.py
@@ -10,35 +10,35 @@
def generate_deprecated_repository_img_str( include_mouse_over=False ):
if include_mouse_over:
- deprecated_tip_str = 'class="icon-button tooltip" title="This repository is deprecated in the Tool Shed"'
+ deprecated_tip_str = 'class="icon-button" title="This repository is deprecated in the Tool Shed"'
else:
deprecated_tip_str = ''
return '<img src="/static/images/icon_error_sml.gif" %s/>' % deprecated_tip_str
def generate_latest_revision_img_str( include_mouse_over=False ):
if include_mouse_over:
- latest_revision_tip_str = 'class="icon-button tooltip" title="This is the latest installable revision of this repository"'
+ latest_revision_tip_str = 'class="icon-button" title="This is the latest installable revision of this repository"'
else:
latest_revision_tip_str = ''
return '<img src="/static/june_2007_style/blue/ok_small.png" %s/>' % latest_revision_tip_str
def generate_revision_updates_img_str( include_mouse_over=False ):
if include_mouse_over:
- revision_updates_tip_str = 'class="icon-button tooltip" title="Updates are available in the Tool Shed for this revision"'
+ revision_updates_tip_str = 'class="icon-button" title="Updates are available in the Tool Shed for this revision"'
else:
revision_updates_tip_str = ''
return '<img src="/static/images/icon_warning_sml.gif" %s/>' % revision_updates_tip_str
def generate_revision_upgrades_img_str( include_mouse_over=False ):
if include_mouse_over:
- revision_upgrades_tip_str = 'class="icon-button tooltip" title="A newer installable revision is available for this repository"'
+ revision_upgrades_tip_str = 'class="icon-button" title="A newer installable revision is available for this repository"'
else:
revision_upgrades_tip_str = ''
return '<img src="/static/images/up.gif" %s/>' % revision_upgrades_tip_str
def generate_unknown_img_str( include_mouse_over=False ):
if include_mouse_over:
- unknown_tip_str = 'class="icon-button tooltip" title="Unable to get information from the Tool Shed"'
+ unknown_tip_str = 'class="icon-button" title="Unable to get information from the Tool Shed"'
else:
unknown_tip_str = ''
return '<img src="/static/june_2007_style/blue/question-octagon-frame.png" %s/>' % unknown_tip_str
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/57ffe706cc18/
Changeset: 57ffe706cc18
User: dan
Date: 2013-09-29 08:04:31
Summary: Add additional check and slice to _sniffnfix_pg9_hex(). Fixes issue seen when attempting to view saved visualizations. Further investigation may be needed.
Affected #: 1 file
diff -r d230a516fdbcbbf6854b6360f98355168449816b -r 57ffe706cc184c630fdf957c5f93b76cb09ac94d lib/galaxy/model/custom_types.py
--- a/lib/galaxy/model/custom_types.py
+++ b/lib/galaxy/model/custom_types.py
@@ -29,6 +29,8 @@
try:
if value[0] == 'x':
return binascii.unhexlify(value[1:])
+ elif value.startswith( '\\x' ):
+ return binascii.unhexlify( value[2:] )
else:
return value
except Exception, ex:
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/735fff26229e/
Changeset: 735fff26229e
User: greg
Date: 2013-09-27 22:38:28
Summary: Mode workflow classes added to the tool shed model for proper workflow display.
Affected #: 1 file
diff -r dc25a4530db870ba55aa268f88800e5bc9956815 -r 735fff26229e56850632a011f7a2374a4ceb48ad lib/galaxy/webapps/tool_shed/model/__init__.py
--- a/lib/galaxy/webapps/tool_shed/model/__init__.py
+++ b/lib/galaxy/webapps/tool_shed/model/__init__.py
@@ -387,6 +387,14 @@
self.workflow_step = workflow_step
+class StoredWorkflowAnnotationAssociation( object ):
+ pass
+
+
+class WorkflowStepAnnotationAssociation( object ):
+ pass
+
+
class Workflow( object ):
def __init__( self ):
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.