From jeremy.goecks@emory.edu Tue Mar 30 17:05:14 2010 From: Jeremy Goecks To: galaxy-dev@lists.galaxyproject.org Subject: Re: [galaxy-dev] Patch: show User menu's history and dataset options show independent of app.config.use_remote_user setting Date: Tue, 30 Mar 2010 17:05:03 -0400 Message-ID: <4a886c491003301405s6b93a8f7g264bdf82ffe08dc7@mail.gmail.com> In-Reply-To: <16F6B5C4-833C-4055-9EEA-50B2B5E93F47@emory.edu> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6741933354917410363==" --===============6741933354917410363== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Patch is changeset 3582:feff604427ee in galaxy-central Thanks, J. On Tue, Mar 30, 2010 at 3:33 PM, Jeremy Goecks wro= te: > Still looks good. We'll get it into galaxy-central in the next day or two. > > Thanks, > J. > > > > On Mar 29, 2010, at 2:51 PM, Ry4an Brase wrote: > > > Just a quick re-ping on this one. It still applies cleanly, but I'm > > happy to rebase if desired. > > > > On Tue, Mar 23, 2010 at 04:08:15PM -0500, Ry4an Brase wrote: > >> It's not much, but we're using a remote_user setup and the History and > >> Datasets menu items were not showing up under the User menu, which > >> didn't seem to be by design. Attached is a micro patch to the template, > >> which is also available here: > >> > >> > http://bitbucket.org/Ry4an/galaxy-umn-msi-changes/src/tip/always-show-users= -history-datasets > >> > >> Also, What's the preferred patch submission mechanism? Patchbomb? > >> Bitbucket pull-request? > >> > >> Thanks, > >> > >> -- > >> Ry4an Brase 612-626-6575 > >> University of Minnesota Supercomputing Institute > >> for Advanced Computational Research > http://www.msi.umn.edu > > > >> # HG changeset patch > >> # User JJ > >> # Date 1269360929 18000 > >> # Node ID 3424869fd91cfe435e7d46ebca7f1ef94ccbee70 > >> # Parent bc2e61c2dac16e6eb37d34f3d3d6dee013b14368 > >> Made User menu's history and dataset options show independent of > >> app.config.use_remote_user setting. > >> > >> diff -r bc2e61c2dac1 -r 3424869fd91c templates/base_panels.mako > >> --- a/templates/base_panels.mako Tue Mar 23 15:43:58 2010 -0400 > >> +++ b/templates/base_panels.mako Tue Mar 23 11:15:29 2010 -0500 > >> @@ -269,12 +269,12 @@ > >> logout_url =3D h.url_for( controller=3D'/user', > action=3D'logout' ) > >> %> > >>
  • href=3D"${logout_url}">Logout
  • > >> -

  • gray"/>
  • > >> -
  • controller=3D'/history', action=3D'list' )}">Histories
  • > >> -
  • controller=3D'/dataset', action=3D'list' )}">Datasets
  • > >> - %if app.config.get_bool( 'enable_pages', False ): > >> -
  • action=3D'list' )}">Pages
  • > >> - %endif > >> + %endif > >> +

  • gray"/>
  • > >> +
  • controller=3D'/history', action=3D'list' )}">Histories
  • > >> +
  • controller=3D'/dataset', action=3D'list' )}">Datasets
  • > >> + %if app.config.get_bool( 'enable_pages', False ): > >> +
  • action=3D'list' )}">Pages
  • > >> %endif > >> > >> > > > > > > -- > > Ry4an Brase 612-626-6575 > > University of Minnesota Supercomputing Institute > > for Advanced Computational Research > http://www.msi.umn.edu > > > ___________________= ____________________________ > > galaxy-dev mailing list > > galaxy-dev(a)lists.bx.psu.edu > > http://lists.bx.psu.edu/listinfo/galaxy-dev > > > _______________________________________________ > galaxy-dev mailing list > galaxy-dev(a)lists.bx.psu.edu > http://lists.bx.psu.edu/listinfo/galaxy-dev > --===============6741933354917410363== Content-Type: text/html Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="attachment.htm" MIME-Version: 1.0 UGF0Y2ggaXMgY2hhbmdlc2V0oDM1ODI6ZmVmZjYwNDQyN2VlIGluIGdhbGF4eS1jZW50cmFsPGRp dj48YnI+PC9kaXY+PGRpdj5UaGFua3MsPC9kaXY+PGRpdj5KLjxicj48YnI+PGRpdiBjbGFzcz0i Z21haWxfcXVvdGUiPk9uIFR1ZSwgTWFyIDMwLCAyMDEwIGF0IDM6MzMgUE0sIEplcmVteSBHb2Vj a3MgPHNwYW4gZGlyPSJsdHIiPiZsdDs8YSBocmVmPSJtYWlsdG86amVyZW15LmdvZWNrc0BlbW9y eS5lZHUiPmplcmVteS5nb2Vja3NAZW1vcnkuZWR1PC9hPiZndDs8L3NwYW4+IHdyb3RlOjxicj4K PGJsb2NrcXVvdGUgY2xhc3M9ImdtYWlsX3F1b3RlIiBzdHlsZT0ibWFyZ2luOjAgMCAwIC44ZXg7 Ym9yZGVyLWxlZnQ6MXB4ICNjY2Mgc29saWQ7cGFkZGluZy1sZWZ0OjFleDsiPlN0aWxsIGxvb2tz IGdvb2QuIFdlJiMzOTtsbCBnZXQgaXQgaW50byBnYWxheHktY2VudHJhbCBpbiB0aGUgbmV4dCBk YXkgb3IgdHdvLjxicj4KPGJyPgpUaGFua3MsPGJyPgpKLjxicj4KPGRpdj48ZGl2PjwvZGl2Pjxk aXYgY2xhc3M9Img1Ij48YnI+Cjxicj4KPGJyPgpPbiBNYXIgMjksIDIwMTAsIGF0IDI6NTEgUE0s IFJ5NGFuIEJyYXNlIHdyb3RlOjxicj4KPGJyPgomZ3Q7IEp1c3QgYSBxdWljayByZS1waW5nIG9u IHRoaXMgb25lLiCgSXQgc3RpbGwgYXBwbGllcyBjbGVhbmx5LCBidXQgSSYjMzk7bTxicj4KJmd0 OyBoYXBweSB0byByZWJhc2UgaWYgZGVzaXJlZC48YnI+CiZndDs8YnI+CiZndDsgT24gVHVlLCBN YXIgMjMsIDIwMTAgYXQgMDQ6MDg6MTVQTSAtMDUwMCwgUnk0YW4gQnJhc2Ugd3JvdGU6PGJyPgom Z3Q7Jmd0OyBJdCYjMzk7cyBub3QgbXVjaCwgYnV0IHdlJiMzOTtyZSB1c2luZyBhIHJlbW90ZV91 c2VyIHNldHVwIGFuZCB0aGUgSGlzdG9yeSBhbmQ8YnI+CiZndDsmZ3Q7IERhdGFzZXRzIG1lbnUg aXRlbXMgd2VyZSBub3Qgc2hvd2luZyB1cCB1bmRlciB0aGUgVXNlciBtZW51LCB3aGljaDxicj4K Jmd0OyZndDsgZGlkbiYjMzk7dCBzZWVtIHRvIGJlIGJ5IGRlc2lnbi4goEF0dGFjaGVkIGlzIGEg bWljcm8gcGF0Y2ggdG8gdGhlIHRlbXBsYXRlLDxicj4KJmd0OyZndDsgd2hpY2ggaXMgYWxzbyBh dmFpbGFibGUgaGVyZTo8YnI+CiZndDsmZ3Q7PGJyPgomZ3Q7Jmd0OyCgIKA8YSBocmVmPSJodHRw Oi8vYml0YnVja2V0Lm9yZy9SeTRhbi9nYWxheHktdW1uLW1zaS1jaGFuZ2VzL3NyYy90aXAvYWx3 YXlzLXNob3ctdXNlcnMtaGlzdG9yeS1kYXRhc2V0cyIgdGFyZ2V0PSJfYmxhbmsiPmh0dHA6Ly9i aXRidWNrZXQub3JnL1J5NGFuL2dhbGF4eS11bW4tbXNpLWNoYW5nZXMvc3JjL3RpcC9hbHdheXMt c2hvdy11c2Vycy1oaXN0b3J5LWRhdGFzZXRzPC9hPjxicj4KCiZndDsmZ3Q7PGJyPgomZ3Q7Jmd0 OyBBbHNvLCBXaGF0JiMzOTtzIHRoZSBwcmVmZXJyZWQgcGF0Y2ggc3VibWlzc2lvbiBtZWNoYW5p c20/IKBQYXRjaGJvbWI/PGJyPgomZ3Q7Jmd0OyBCaXRidWNrZXQgcHVsbC1yZXF1ZXN0Pzxicj4K Jmd0OyZndDs8YnI+CiZndDsmZ3Q7IFRoYW5rcyw8YnI+CiZndDsmZ3Q7PGJyPgomZ3Q7Jmd0OyAt LTxicj4KJmd0OyZndDsgUnk0YW4gQnJhc2UgoCCgIKAgoCCgIKAgoCCgIKAgoCCgIKAgoCCgIKAg oCCgIKAgoCCgIDYxMi02MjYtNjU3NTxicj4KJmd0OyZndDsgVW5pdmVyc2l0eSBvZiBNaW5uZXNv dGEgU3VwZXJjb21wdXRpbmcgSW5zdGl0dXRlPGJyPgomZ3Q7Jmd0OyBmb3IgQWR2YW5jZWQgQ29t cHV0YXRpb25hbCBSZXNlYXJjaCCgIKAgoCCgIKAgoCCgIKAgPGEgaHJlZj0iaHR0cDovL3d3dy5t c2kudW1uLmVkdSIgdGFyZ2V0PSJfYmxhbmsiPmh0dHA6Ly93d3cubXNpLnVtbi5lZHU8L2E+PGJy PgomZ3Q7PGJyPgomZ3Q7Jmd0OyAjIEhHIGNoYW5nZXNldCBwYXRjaDxicj4KJmd0OyZndDsgIyBV c2VyIEpKICZsdDs8YSBocmVmPSJtYWlsdG86ampAbXNpLnVtbi5lZHUiPmpqQG1zaS51bW4uZWR1 PC9hPiZndDs8YnI+CiZndDsmZ3Q7ICMgRGF0ZSAxMjY5MzYwOTI5IDE4MDAwPGJyPgomZ3Q7Jmd0 OyAjIE5vZGUgSUQgMzQyNDg2OWZkOTFjZmU0MzVlN2Q0NmViY2E3ZjFlZjk0Y2NiZWU3MDxicj4K Jmd0OyZndDsgIyBQYXJlbnQgoGJjMmU2MWMyZGFjMTZlNmViMzdkMzRmM2QzZDZkZWUwMTNiMTQz Njg8YnI+CiZndDsmZ3Q7IE1hZGUgVXNlciBtZW51JiMzOTtzIGhpc3RvcnkgYW5kIGRhdGFzZXQg b3B0aW9ucyBzaG93IGluZGVwZW5kZW50IG9mPGJyPgomZ3Q7Jmd0OyBhcHAuY29uZmlnLnVzZV9y ZW1vdGVfdXNlciBzZXR0aW5nLjxicj4KJmd0OyZndDs8YnI+CiZndDsmZ3Q7IGRpZmYgLXIgYmMy ZTYxYzJkYWMxIC1yIDM0MjQ4NjlmZDkxYyB0ZW1wbGF0ZXMvYmFzZV9wYW5lbHMubWFrbzxicj4K Jmd0OyZndDsgLS0tIGEvdGVtcGxhdGVzL2Jhc2VfcGFuZWxzLm1ha28goCCgIFR1ZSBNYXIgMjMg MTU6NDM6NTggMjAxMCAtMDQwMDxicj4KJmd0OyZndDsgKysrIGIvdGVtcGxhdGVzL2Jhc2VfcGFu ZWxzLm1ha28goCCgIFR1ZSBNYXIgMjMgMTE6MTU6MjkgMjAxMCAtMDUwMDxicj4KJmd0OyZndDsg QEAgLTI2OSwxMiArMjY5LDEyIEBAPGJyPgomZ3Q7Jmd0OyCgIKAgoCCgIKAgoCCgIKAgoCCgIKAg oCBsb2dvdXRfdXJsID0gaC51cmxfZm9yKCBjb250cm9sbGVyPSYjMzk7L3VzZXImIzM5OywgYWN0 aW9uPSYjMzk7bG9nb3V0JiMzOTsgKTxicj4KJmd0OyZndDsgoCCgIKAgoCCgIKAgoCCgICUmZ3Q7 PGJyPgomZ3Q7Jmd0OyCgIKAgoCCgIKAgoCCgIKAgJmx0O2xpJmd0OyZsdDthIHRhcmdldD0mcXVv dDske2xvZ291dF90YXJnZXR9JnF1b3Q7IGhyZWY9JnF1b3Q7JHtsb2dvdXRfdXJsfSZxdW90OyZn dDtMb2dvdXQmbHQ7L2EmZ3Q7Jmx0Oy9saSZndDs8YnI+CiZndDsmZ3Q7IC0goCCgIKAgoCCgIKAg oCCgJmx0O2xpJmd0OyZsdDtociBzdHlsZT0mcXVvdDtjb2xvcjogaW5oZXJpdDsgYmFja2dyb3Vu ZC1jb2xvcjogZ3JheSZxdW90Oy8mZ3Q7Jmx0Oy9saSZndDs8YnI+CiZndDsmZ3Q7IC0goCCgIKAg oCCgIKAgoCCgJmx0O2xpJmd0OyZsdDthIHRhcmdldD0mcXVvdDtnYWxheHlfbWFpbiZxdW90OyBo cmVmPSZxdW90OyR7aC51cmxfZm9yKCBjb250cm9sbGVyPSYjMzk7L2hpc3RvcnkmIzM5OywgYWN0 aW9uPSYjMzk7bGlzdCYjMzk7ICl9JnF1b3Q7Jmd0O0hpc3RvcmllcyZsdDsvYSZndDsmbHQ7L2xp Jmd0Ozxicj4KJmd0OyZndDsgLSCgIKAgoCCgIKAgoCCgIKAmbHQ7bGkmZ3Q7Jmx0O2EgdGFyZ2V0 PSZxdW90O2dhbGF4eV9tYWluJnF1b3Q7IGhyZWY9JnF1b3Q7JHtoLnVybF9mb3IoIGNvbnRyb2xs ZXI9JiMzOTsvZGF0YXNldCYjMzk7LCBhY3Rpb249JiMzOTtsaXN0JiMzOTsgKX0mcXVvdDsmZ3Q7 RGF0YXNldHMmbHQ7L2EmZ3Q7Jmx0Oy9saSZndDs8YnI+CiZndDsmZ3Q7IC0goCCgIKAgoCCgIKAg oCCgJWlmIGFwcC5jb25maWcuZ2V0X2Jvb2woICYjMzk7ZW5hYmxlX3BhZ2VzJiMzOTssIEZhbHNl ICk6PGJyPgomZ3Q7Jmd0OyAtIKAgoCCgIKAgoCCgIKAgoCCgIKAmbHQ7bGkmZ3Q7Jmx0O2EgaHJl Zj0mcXVvdDske2gudXJsX2ZvciggY29udHJvbGxlcj0mIzM5Oy9wYWdlJiMzOTssIGFjdGlvbj0m IzM5O2xpc3QmIzM5OyApfSZxdW90OyZndDtQYWdlcyZsdDsvYSZndDsmbHQ7L2xpJmd0Ozxicj4K Jmd0OyZndDsgLSCgIKAgoCCgIKAgoCCgIKAlZW5kaWY8YnI+CiZndDsmZ3Q7ICsgoCCgIKAgoCCg IKAlZW5kaWY8YnI+CiZndDsmZ3Q7ICsgoCCgIKAgoCCgIKAmbHQ7bGkmZ3Q7Jmx0O2hyIHN0eWxl PSZxdW90O2NvbG9yOiBpbmhlcml0OyBiYWNrZ3JvdW5kLWNvbG9yOiBncmF5JnF1b3Q7LyZndDsm bHQ7L2xpJmd0Ozxicj4KJmd0OyZndDsgKyCgIKAgoCCgIKAgoCZsdDtsaSZndDsmbHQ7YSB0YXJn ZXQ9JnF1b3Q7Z2FsYXh5X21haW4mcXVvdDsgaHJlZj0mcXVvdDske2gudXJsX2ZvciggY29udHJv bGxlcj0mIzM5Oy9oaXN0b3J5JiMzOTssIGFjdGlvbj0mIzM5O2xpc3QmIzM5OyApfSZxdW90OyZn dDtIaXN0b3JpZXMmbHQ7L2EmZ3Q7Jmx0Oy9saSZndDs8YnI+CiZndDsmZ3Q7ICsgoCCgIKAgoCCg IKAmbHQ7bGkmZ3Q7Jmx0O2EgdGFyZ2V0PSZxdW90O2dhbGF4eV9tYWluJnF1b3Q7IGhyZWY9JnF1 b3Q7JHtoLnVybF9mb3IoIGNvbnRyb2xsZXI9JiMzOTsvZGF0YXNldCYjMzk7LCBhY3Rpb249JiMz OTtsaXN0JiMzOTsgKX0mcXVvdDsmZ3Q7RGF0YXNldHMmbHQ7L2EmZ3Q7Jmx0Oy9saSZndDs8YnI+ CiZndDsmZ3Q7ICsgoCCgIKAgoCCgIKAlaWYgYXBwLmNvbmZpZy5nZXRfYm9vbCggJiMzOTtlbmFi bGVfcGFnZXMmIzM5OywgRmFsc2UgKTo8YnI+CiZndDsmZ3Q7ICsgoCCgIKAgoCCgIKAgoCCgJmx0 O2xpJmd0OyZsdDthIGhyZWY9JnF1b3Q7JHtoLnVybF9mb3IoIGNvbnRyb2xsZXI9JiMzOTsvcGFn ZSYjMzk7LCBhY3Rpb249JiMzOTtsaXN0JiMzOTsgKX0mcXVvdDsmZ3Q7UGFnZXMmbHQ7L2EmZ3Q7 Jmx0Oy9saSZndDs8YnI+CiZndDsmZ3Q7IKAgoCCgIKAgoCCgICVlbmRpZjxicj4KJmd0OyZndDsg oCCgIKAgoCAmbHQ7L3VsJmd0Ozxicj4KJmd0OyZndDsgoCCgIKAgoCAmbHQ7L2RpdiZndDs8YnI+ CiZndDs8YnI+CiZndDs8YnI+CiZndDsgLS08YnI+CiZndDsgUnk0YW4gQnJhc2UgoCCgIKAgoCCg IKAgoCCgIKAgoCCgIKAgoCCgIKAgoCCgIKAgoCCgIDYxMi02MjYtNjU3NTxicj4KJmd0OyBVbml2 ZXJzaXR5IG9mIE1pbm5lc290YSBTdXBlcmNvbXB1dGluZyBJbnN0aXR1dGU8YnI+CiZndDsgZm9y IEFkdmFuY2VkIENvbXB1dGF0aW9uYWwgUmVzZWFyY2ggoCCgIKAgoCCgIKAgoCCgIDxhIGhyZWY9 Imh0dHA6Ly93d3cubXNpLnVtbi5lZHUiIHRhcmdldD0iX2JsYW5rIj5odHRwOi8vd3d3Lm1zaS51 bW4uZWR1PC9hPjxicj4KPC9kaXY+PC9kaXY+Jmd0OyAmbHQ7cnk0YW4tdW1uLW1zaS1hbHdheXMt c2hvdy11c2Vycy1oaXN0b3J5LWRhdGFzZXRzLnBhdGNoJmd0O19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fPGJyPgo8ZGl2PjxkaXY+PC9kaXY+PGRpdiBjbGFz cz0iaDUiPiZndDsgZ2FsYXh5LWRldiBtYWlsaW5nIGxpc3Q8YnI+CiZndDsgPGEgaHJlZj0ibWFp bHRvOmdhbGF4eS1kZXZAbGlzdHMuYngucHN1LmVkdSI+Z2FsYXh5LWRldkBsaXN0cy5ieC5wc3Uu ZWR1PC9hPjxicj4KJmd0OyA8YSBocmVmPSJodHRwOi8vbGlzdHMuYngucHN1LmVkdS9saXN0aW5m by9nYWxheHktZGV2IiB0YXJnZXQ9Il9ibGFuayI+aHR0cDovL2xpc3RzLmJ4LnBzdS5lZHUvbGlz dGluZm8vZ2FsYXh5LWRldjwvYT48YnI+Cjxicj4KPGJyPgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXzxicj4KZ2FsYXh5LWRldiBtYWlsaW5nIGxpc3Q8YnI+ CjxhIGhyZWY9Im1haWx0bzpnYWxheHktZGV2QGxpc3RzLmJ4LnBzdS5lZHUiPmdhbGF4eS1kZXZA bGlzdHMuYngucHN1LmVkdTwvYT48YnI+CjxhIGhyZWY9Imh0dHA6Ly9saXN0cy5ieC5wc3UuZWR1 L2xpc3RpbmZvL2dhbGF4eS1kZXYiIHRhcmdldD0iX2JsYW5rIj5odHRwOi8vbGlzdHMuYngucHN1 LmVkdS9saXN0aW5mby9nYWxheHktZGV2PC9hPjxicj4KPC9kaXY+PC9kaXY+PC9ibG9ja3F1b3Rl PjwvZGl2Pjxicj48L2Rpdj4K --===============6741933354917410363==--