2 new commits in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/6dbe92e40de6/
Changeset: 6dbe92e40de6
Branch: next-stable
User: greg
Date: 2013-06-01 23:22:27
Summary: Fix for resetting all metadata on writable repositories in the tool shed when the user is not an admin.
Affected #: 1 file
diff -r 016b0b22e826625ce39621aeebccdee4d3f6a959 -r 6dbe92e40de6d352b4d54ec31c89e83fafcdd532 templates/webapps/tool_shed/common/reset_metadata_on_selected_repositories.mako
--- a/templates/webapps/tool_shed/common/reset_metadata_on_selected_repositories.mako
+++ b/templates/webapps/tool_shed/common/reset_metadata_on_selected_repositories.mako
@@ -19,7 +19,15 @@
<div class="toolForm"><div class="toolFormTitle">Reset all metadata on each selected repository</div>
- <form name="reset_metadata_on_selected_repositories" id="reset_metadata_on_selected_repositories" action="${h.url_for( controller='admin', action='reset_metadata_on_selected_repositories_in_tool_shed' )}" method="post" >
+ <%
+ if trans.user_is_admin():
+ controller = 'admin'
+ action = 'reset_metadata_on_selected_repositories_in_tool_shed'
+ else:
+ controller = 'repository'
+ action = 'reset_metadata_on_my_writable_repositories_in_tool_shed'
+ %>
+ <form name="reset_metadata_on_selected_repositories" id="reset_metadata_on_selected_repositories" action="${h.url_for( controller=controller, action=action )}" method="post" ><div class="form-row">
Check each repository for which you want to reset metadata. Repository names are followed by owners in parentheses.
</div>
https://bitbucket.org/galaxy/galaxy-central/commits/716f29e4c77d/
Changeset: 716f29e4c77d
User: greg
Date: 2013-06-01 23:23:12
Summary: Merged from next-stable
Affected #: 1 file
diff -r f1bbaa14ddd16181c59d89a3f66d49a6e360c327 -r 716f29e4c77d2246a49c92ea205734f768369fbb templates/webapps/tool_shed/common/reset_metadata_on_selected_repositories.mako
--- a/templates/webapps/tool_shed/common/reset_metadata_on_selected_repositories.mako
+++ b/templates/webapps/tool_shed/common/reset_metadata_on_selected_repositories.mako
@@ -19,7 +19,15 @@
<div class="toolForm"><div class="toolFormTitle">Reset all metadata on each selected repository</div>
- <form name="reset_metadata_on_selected_repositories" id="reset_metadata_on_selected_repositories" action="${h.url_for( controller='admin', action='reset_metadata_on_selected_repositories_in_tool_shed' )}" method="post" >
+ <%
+ if trans.user_is_admin():
+ controller = 'admin'
+ action = 'reset_metadata_on_selected_repositories_in_tool_shed'
+ else:
+ controller = 'repository'
+ action = 'reset_metadata_on_my_writable_repositories_in_tool_shed'
+ %>
+ <form name="reset_metadata_on_selected_repositories" id="reset_metadata_on_selected_repositories" action="${h.url_for( controller=controller, action=action )}" method="post" ><div class="form-row">
Check each repository for which you want to reset metadata. Repository names are followed by owners in parentheses.
</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.
2 new commits in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/016b0b22e826/
Changeset: 016b0b22e826
Branch: next-stable
User: greg
Date: 2013-06-01 20:29:31
Summary: Strip traling / from tool shed url when using it's value to search the Galaxy database.
Affected #: 1 file
diff -r c3fe9ba931c20975711dad6e410c9a4d0601c1fc -r 016b0b22e826625ce39621aeebccdee4d3f6a959 lib/tool_shed/util/shed_util_common.py
--- a/lib/tool_shed/util/shed_util_common.py
+++ b/lib/tool_shed/util/shed_util_common.py
@@ -685,6 +685,8 @@
def get_repository_for_dependency_relationship( app, tool_shed, name, owner, changeset_revision ):
"""Return a tool shed repository database record that is defined by either the current changeset revision or the installed_changeset_revision."""
# This method is used only in Galaxy, not the tool shed.
+ if tool_shed.endswith( '/' ):
+ tool_shed = tool_shed.rstrip( '/' )
repository = get_tool_shed_repository_by_shed_name_owner_installed_changeset_revision( app=app,
tool_shed=tool_shed,
name=name,
https://bitbucket.org/galaxy/galaxy-central/commits/f1bbaa14ddd1/
Changeset: f1bbaa14ddd1
User: greg
Date: 2013-06-01 20:30:16
Summary: Merged from next-stable
Affected #: 1 file
diff -r 7c9738db4d0004490329a87e15091a1be02628b6 -r f1bbaa14ddd16181c59d89a3f66d49a6e360c327 lib/tool_shed/util/shed_util_common.py
--- a/lib/tool_shed/util/shed_util_common.py
+++ b/lib/tool_shed/util/shed_util_common.py
@@ -685,6 +685,8 @@
def get_repository_for_dependency_relationship( app, tool_shed, name, owner, changeset_revision ):
"""Return a tool shed repository database record that is defined by either the current changeset revision or the installed_changeset_revision."""
# This method is used only in Galaxy, not the tool shed.
+ if tool_shed.endswith( '/' ):
+ tool_shed = tool_shed.rstrip( '/' )
repository = get_tool_shed_repository_by_shed_name_owner_installed_changeset_revision( app=app,
tool_shed=tool_shed,
name=name,
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.