4 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/changeset/ffbbcf5c4062/ changeset: ffbbcf5c4062 user: dan date: 2012-10-12 21:54:51 summary: Enable managing a Tool Shed Repository from the 'already installed' message. affected #: 1 file diff -r f8869673cf8cac165cd738333b48f0b21f3de60e -r ffbbcf5c4062c8ede8f9544515c683ca3849a3e7 lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py --- a/lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py +++ b/lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py @@ -1103,6 +1103,7 @@ if installed_changeset_revision != changeset_revision: message += "You can get the latest updates for the repository using the <b>Get updates</b> option from the repository's " message += "<b>Repository Actions</b> pop-up menu. " + message+= 'Click <a href="%s">here</a> to manage the repository. ' % ( web.url_for( controller='admin_toolshed', action='manage_repository', id=trans.security.encode_id( installed_tool_shed_repository.id ) ) ) status = 'error' if len( repo_info_dicts ) == 1: new_kwd = dict( message=message, status=status ) https://bitbucket.org/galaxy/galaxy-central/changeset/1c4d091e2633/ changeset: 1c4d091e2633 user: dan date: 2012-10-12 21:54:51 summary: Add a few helper properties to ToolShedRepository model object. affected #: 1 file diff -r ffbbcf5c4062c8ede8f9544515c683ca3849a3e7 -r 1c4d091e2633a9145da3d1e13ec16324c5ff1363 lib/galaxy/model/__init__.py --- a/lib/galaxy/model/__init__.py +++ b/lib/galaxy/model/__init__.py @@ -3095,6 +3095,15 @@ def can_reset_metadata( self ): return self.status == self.installation_status.INSTALLED @property + def can_uninstall( self ): + return self.status != self.installation_status.UNINSTALLED + @property + def can_deactivate( self ): + return self.status not in [ self.installation_status.DEACTIVATED, self.installation_status.UNINSTALLED ] + @property + def can_reinstall_or_activate( self ): + return self.deleted + @property def includes_tools( self ): return self.metadata and 'tools' in self.metadata @property https://bitbucket.org/galaxy/galaxy-central/changeset/1ddd5d6d0eea/ changeset: 1ddd5d6d0eea user: dan date: 2012-10-12 21:54:51 summary: Enable activating and reinstalling Repositories from the manage repository page. affected #: 1 file diff -r 1c4d091e2633a9145da3d1e13ec16324c5ff1363 -r 1ddd5d6d0eead93d7f16f9867a39a241101d35f1 templates/admin/tool_shed_repository/manage_repository.mako --- a/templates/admin/tool_shed_repository/manage_repository.mako +++ b/templates/admin/tool_shed_repository/manage_repository.mako @@ -6,11 +6,14 @@ <ul class="manage-table-actions"><li><a class="action-button" id="repository-${repository.id}-popup" class="menubutton">Repository Actions</a></li><div popupmenu="repository-${repository.id}-popup"> + %if repository.can_reinstall_or_activate: + <a class="action-button" href="${h.url_for( controller='admin_toolshed', action='browse_repositories', operation='activate or reinstall', id=trans.security.encode_id( repository.id ) )}">Activate or reinstall repository</a> + %endif %if repository.in_error_state: <a class="action-button" href="${h.url_for( controller='admin_toolshed', action='reset_to_install', id=trans.security.encode_id( repository.id ), reset_repository=True )}">Reset to install</a> %elif repository.can_install: <a class="action-button" href="${h.url_for( controller='admin_toolshed', action='manage_repository', id=trans.security.encode_id( repository.id ), operation='install' )}">Install</a> - %else: + %elif repository.can_uninstall: %if repository.has_readme: <a class="action-button" href="${h.url_for( controller='admin_toolshed', action='view_readme', id=trans.security.encode_id( repository.id ) )}">View README</a> %endif https://bitbucket.org/galaxy/galaxy-central/changeset/fab66d5e4ea1/ changeset: fab66d5e4ea1 user: dan date: 2012-10-12 21:54:52 summary: Enhance repository deactivate or uninstall page to better handle when a repository has been been deactivated but not uninstalled affected #: 1 file diff -r 1ddd5d6d0eead93d7f16f9867a39a241101d35f1 -r fab66d5e4ea1c91afbcc31f69200cbdca2ec7680 templates/admin/tool_shed_repository/deactivate_or_uninstall_repository.mako --- a/templates/admin/tool_shed_repository/deactivate_or_uninstall_repository.mako +++ b/templates/admin/tool_shed_repository/deactivate_or_uninstall_repository.mako @@ -53,32 +53,39 @@ ${repository.deleted} </div><div class="form-row"> - ${remove_from_disk_check_box.get_html()} - <label for="repository" style="display: inline;font-weight:normal;">Check to uninstall or leave blank to deactivate</label> - <br/><br/> - <label>Deactivating this repository will result in the following:</label> - <div class="toolParamHelp" style="clear: both;"> - * The repository and all of it's contents will remain on disk. - </div> - %if repository.includes_tools: + %if repository.can_deactivate: + <% deactivate_uninstall_button_text = "Deactivate or Uninstall" %> + ${remove_from_disk_check_box.get_html()} + <label for="repository" style="display: inline;font-weight:normal;">Check to uninstall or leave blank to deactivate</label> + <br/><br/> + <label>Deactivating this repository will result in the following:</label><div class="toolParamHelp" style="clear: both;"> - * The repository's tools will not be loaded into the tool panel. + * The repository and all of it's contents will remain on disk. </div> + %if repository.includes_tools: + <div class="toolParamHelp" style="clear: both;"> + * The repository's tools will not be loaded into the tool panel. + </div> + %endif + %if repository.includes_tool_dependencies: + <div class="toolParamHelp" style="clear: both;"> + * The repository's installed tool dependencies will remain on disk. + </div> + %endif + %if repository.includes_datatypes: + <div class="toolParamHelp" style="clear: both;"> + * The repository's datatypes, datatype converters and display applications will be eliminated from the datatypes registry. + </div> + %endif + <div class="toolParamHelp" style="clear: both;"> + * The repository record's deleted column in the tool_shed_repository database table will be set to True. + </div> + <br/> + %else: + <% deactivate_uninstall_button_text = "Uninstall" %> + ##hack to mimic check box + <input type="hidden" name="remove_from_disk" value="true"/><input type="hidden" name="remove_from_disk" value="true"/> %endif - %if repository.includes_tool_dependencies: - <div class="toolParamHelp" style="clear: both;"> - * The repository's installed tool dependencies will remain on disk. - </div> - %endif - %if repository.includes_datatypes: - <div class="toolParamHelp" style="clear: both;"> - * The repository's datatypes, datatype converters and display applications will be eliminated from the datatypes registry. - </div> - %endif - <div class="toolParamHelp" style="clear: both;"> - * The repository record's deleted column in the tool_shed_repository database table will be set to True. - </div> - <br/><label>Uninstalling this repository will result in the following:</label><div class="toolParamHelp" style="clear: both;"> * The repository and all of it's contents will be removed from disk. @@ -110,7 +117,7 @@ <div style="clear: both"></div></div><div class="form-row"> - <input type="submit" name="deactivate_or_uninstall_repository_button" value="Deactivate or Uninstall"/> + <input type="submit" name="deactivate_or_uninstall_repository_button" value="${deactivate_uninstall_button_text}"/></div></form></div> 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.