From commits-noreply@bitbucket.org Mon Aug 22 16:31:56 2011
From: Bitbucket <commits-noreply@bitbucket.org>
To: galaxy-commits@lists.galaxyproject.org
Subject: [galaxy-commits] commit/galaxy-central: greg: Add the ability to
 switch between tool shed repository revsions when viewing tool metadata.
Date: Mon, 22 Aug 2011 20:31:54 +0000
Message-ID: <20110822203154.5332.56261@bitbucket01.managed.contegix.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6740648319170749036=="

--===============6740648319170749036==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

1 new changeset in galaxy-central:

http://bitbucket.org/galaxy/galaxy-central/changeset/b1f22f337651/
changeset:   b1f22f337651
user:        greg
date:        2011-08-22 22:31:50
summary:     Add the ability to switch between tool shed repository revsions =
when viewing tool metadata.
affected #:  3 files (1.5 KB)

--- a/lib/galaxy/webapps/community/controllers/repository.py	Mon Aug 22 16:19=
:49 2011 -0400
+++ b/lib/galaxy/webapps/community/controllers/repository.py	Mon Aug 22 16:31=
:50 2011 -0400
@@ -1157,12 +1157,17 @@
                         tool =3D None
                     break
         is_malicious =3D change_set_is_malicious( trans, repository_id, repo=
sitory.tip )
+        changeset_revision_select_field =3D build_changeset_revision_select_=
field( trans,
+                                                                            =
     repository,
+                                                                            =
     selected_value=3Dchangeset_revision,
+                                                                            =
     add_id_to_name=3DFalse )
         return trans.fill_template( "/webapps/community/repository/view_tool=
_metadata.mako",
                                     repository=3Drepository,
                                     tool=3Dtool,
                                     metadata=3Dmetadata,
                                     changeset_revision=3Dchangeset_revision,
                                     revision_label=3Drevision_label,
+                                    changeset_revision_select_field=3Dchange=
set_revision_select_field,
                                     is_malicious=3Dis_malicious,
                                     message=3Dmessage,
                                     status=3Dstatus )


--- a/templates/webapps/community/repository/manage_repository.mako	Mon Aug 2=
2 16:19:49 2011 -0400
+++ b/templates/webapps/community/repository/manage_repository.mako	Mon Aug 2=
2 16:31:50 2011 -0400
@@ -19,7 +19,7 @@
         browse_label =3D 'Browse or delete repository files'
     else:
         browse_label =3D 'Browse repository files'
-    can_set_malicious =3D metadata and can_set_metadata and is_admin
+    can_set_malicious =3D metadata and can_set_metadata and is_admin and cha=
ngeset_revision =3D=3D repository.tip
 %><%!


--- a/templates/webapps/community/repository/view_tool_metadata.mako	Mon Aug =
22 16:19:49 2011 -0400
+++ b/templates/webapps/community/repository/view_tool_metadata.mako	Mon Aug =
22 16:31:50 2011 -0400
@@ -71,14 +71,31 @@
 <div class=3D"toolForm"><div class=3D"toolFormTitle">Repository revision</di=
v><div class=3D"toolFormBody">
-        <div class=3D"form-row">
-            <label>Revision:</label>
-            %if can_view_change_log:
-                <a href=3D"${h.url_for( controller=3D'repository', action=3D=
'view_changelog', id=3Dtrans.app.security.encode_id( repository.id ) )}">${re=
vision_label}</a>
-            %else:
-                ${revision_label}
-            %endif
-        </div>
+        %if len( changeset_revision_select_field.options ) > 1:
+            <form name=3D"change_revision" id=3D"change_revision" action=3D"=
${h.url_for( controller=3D'repository', action=3D'view_tool_metadata', reposi=
tory_id=3Dtrans.security.encode_id( repository.id ), tool_id=3Dmetadata[ 'id'=
 ] )}" method=3D"post" >
+                <div class=3D"form-row">
+                    <%
+                        if changeset_revision =3D=3D repository.tip:
+                            tip_str =3D 'repository tip'
+                        else:
+                            tip_str =3D ''
+                    %>
+                    ${changeset_revision_select_field.get_html()} <i>${tip_s=
tr}</i>
+                    <div class=3D"toolParamHelp" style=3D"clear: both;">
+                        Select a revision to inspect and download versions o=
f tools from this repository.
+                    </div>
+                </div>
+            </form>
+        %else:
+            <div class=3D"form-row">
+                <label>Revision:</label>
+                %if can_view_change_log:
+                    <a href=3D"${h.url_for( controller=3D'repository', actio=
n=3D'view_changelog', id=3Dtrans.app.security.encode_id( repository.id ) )}">=
${revision_label}</a>
+                %else:
+                    ${revision_label}
+                %endif
+            </div>
+        %endif
     </div></div><p/>

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.

--===============6740648319170749036==--