1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/changeset/5cdb0038c89d/
changeset: 5cdb0038c89d
user: carlfeberhard
date: 2012-09-18 18:39:13
summary: fix to apply tooltips to running/queued datasets in history panel
affected #: 1 file
diff -r 069768b7833ebae78f1c7c7aa97904627540ac3a -r 5cdb0038c89d1396755b2c7e371bde63b221b8df templates/root/history.mako
--- a/templates/root/history.mako
+++ b/templates/root/history.mako
@@ -116,6 +116,43 @@
});
};
+// -----------------------------------------------------------------------------
+function applyTooltip( elem ){
+ // apply twitter bootstrap tooltip to elem
+
+ //!! 2 line tooltips placed above do not render properly
+ //TODO: hack (github has an issue on this - see how it's resolved)
+ var $this = $( elem );
+ if( $this.hasClass( 'tooltip' ) ){
+
+ // remove original tooltip
+ if( $this.attr( 'data-original-title' ) ){
+ // documented method - that doesn't seem to work
+ //$( this ).tooltip( 'destroy' );
+ $this.data( 'tooltip', false );
+
+ // swap title back
+ var title = $this.attr( 'data-original-title' );
+ $this.attr( 'data-original-title', null );
+ $this.attr( 'title', title );
+ }
+
+ // (re-)apply tooltip
+ // place them on the bottom for now
+ $this.tooltip({ placement : 'bottom' });
+ }
+ return this;
+}
+
+function applyTooltips( elem ){
+ // apply twitter bootstrap tooltips to this element and all children
+ $( $( elem ).find( '.tooltip' ).andSelf() ).each( function(){
+ applyTooltip( this );
+ });
+ return this;
+}
+
+// -----------------------------------------------------------------------------
// Create trackster action function.
function create_trackster_action_fn(vis_url, dataset_params, dbkey) {
return function() {
@@ -327,24 +364,7 @@
tag_handling(this);
annotation_handling(this);
-
- //TODO: hack (github has an issue on this - see how it's resolved)
- // fix for two line bootstrap tooltips when placement: above
- $( this ).find( '.tooltip' ).each( function(){
- var $this = $( this );
-
- // documented method - that doesn't seem to work
- //$( this ).tooltip( 'destroy' );
-
- $this.data( 'tooltip', false );
- var title = $this.attr( 'data-original-title' );
- $this.attr( 'data-original-title', null );
- $this.attr( 'title', title );
-
- // place them on the bottom for now
- $this.tooltip({ placement : 'bottom' });
- });
-
+ applyTooltips( this );
});
_.each( $(".visualize-icon"), function(icon) {
@@ -469,8 +489,12 @@
var container = $("#historyItemContainer-" + id);
container.html( val.html );
init_history_items( $("div.historyItemWrapper"), "noinit" );
+
+ // apply ui element behaviors
tag_handling(container);
annotation_handling(container);
+ applyTooltips( container );
+
var viz_icon = container.find(".visualize-icon")[0];
if (viz_icon) { init_viz_icon(viz_icon); }
@@ -674,4 +698,4 @@
</div></body>
-</html>
+</html>
\ No newline at end of file
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/changeset/069768b7833e/
changeset: 069768b7833e
user: natefoo
date: 2012-09-18 18:13:02
summary: Add $__user_name__ to job template.
affected #: 1 file
diff -r 32091cc60876e9720f2ae2b855e9e7f43e8c775a -r 069768b7833ebae78f1c7c7aa97904627540ac3a lib/galaxy/jobs/__init__.py
--- a/lib/galaxy/jobs/__init__.py
+++ b/lib/galaxy/jobs/__init__.py
@@ -155,15 +155,18 @@
if special:
out_data[ "output_file" ] = FakeDatasetAssociation( dataset=special.dataset )
- # These can be passed on the command line if wanted as $userId $userEmail
- if job.history and job.history.user: # check for anonymous user!
- userId = '%d' % job.history.user.id
- userEmail = str(job.history.user.email)
+ # These can be passed on the command line if wanted as $__user_*__
+ if job.history and job.history.user:
+ user_id = '%d' % job.history.user.id
+ user_email = str(job.history.user.email)
+ user_name = str(job.history.user.username)
else:
- userId = 'Anonymous'
- userEmail = 'Anonymous'
- incoming['__user_id__'] = incoming['userId'] = userId
- incoming['__user_email__'] = incoming['userEmail'] = userEmail
+ user_id = 'Anonymous'
+ user_email = 'Anonymous'
+ user_name = 'Anonymous'
+ incoming['__user_id__'] = incoming['userId'] = user_id
+ incoming['__user_email__'] = incoming['userEmail'] = user_email
+ incoming['__user_name__'] = user_name
# Build params, done before hook so hook can use
param_dict = self.tool.build_param_dict( incoming, inp_data, out_data, self.get_output_fnames(), self.working_directory )
# Certain tools require tasks to be completed prior to job execution
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/changeset/5359d1066d91/
changeset: 5359d1066d91
user: dannon
date: 2012-09-18 15:34:51
summary: Grammar. it's -> its in admin panel (and tests)
affected #: 2 files
diff -r ba64c2178fbee9a83f79580c434ab280d8a0b738 -r 5359d1066d91849fbf075f95f4999613d17a9c45 templates/webapps/galaxy/admin/center.mako
--- a/templates/webapps/galaxy/admin/center.mako
+++ b/templates/webapps/galaxy/admin/center.mako
@@ -51,7 +51,7 @@
then users that have Role2 will be able to access the library, but will not see those contained datasets whose [dataset] "access" permission
is associated with only Role1.
<p/>
- In addition to the "access library" permission, permission to perform the following functions on the data library (and it's contents) can
+ In addition to the "access library" permission, permission to perform the following functions on the data library (and its contents) can
be granted to users (a library item is one of: a data library, a library folder, a library dataset).
<p/><ul>
diff -r ba64c2178fbee9a83f79580c434ab280d8a0b738 -r 5359d1066d91849fbf075f95f4999613d17a9c45 test/functional/test_library_security.py
--- a/test/functional/test_library_security.py
+++ b/test/functional/test_library_security.py
@@ -93,7 +93,7 @@
permissions_in = [ k for k, v in galaxy.model.Library.permitted_actions.items() ]
permissions_out = []
# Role1 members are: admin_user, regular_user1, regular_user3. Each of these users will be permitted for
- # LIBRARY_ACCESS, LIBRARY_ADD, LIBRARY_MODIFY, LIBRARY_MANAGE on library1 and it's contents.
+ # LIBRARY_ACCESS, LIBRARY_ADD, LIBRARY_MODIFY, LIBRARY_MANAGE on library1 and its contents.
self.library_permissions( self.security.encode_id( library1.id ),
library1.name,
str( role1.id ),
@@ -163,7 +163,7 @@
# Logged in as admin_user
#
# LIBRARY_ACCESS = Role1: admin_user, regular_user1, regular_user3. Each of these users will be permitted for
- # LIBRARY_ACCESS, LIBRARY_ADD, LIBRARY_MODIFY, LIBRARY_MANAGE on this library and it's contents.
+ # LIBRARY_ACCESS, LIBRARY_ADD, LIBRARY_MODIFY, LIBRARY_MANAGE on this library and its contents.
#
# Legitimate roles displayed on the permission form are as follows:
# 'Role1' since the LIBRARY_ACCESS permission is associated with Role1. # Role one members are: admin_user, regular_user1, regular_user3.
@@ -239,7 +239,7 @@
# groups: group1
# users: test(a)bx.psu.edu, test1(a)bx.psu.edu via group1
#
- # We first need to make library1 public, but leave it's contents permissions unchanged
+ # We first need to make library1 public, but leave its contents permissions unchanged
self.make_library_item_public( self.security.encode_id( library1.id ),
self.security.encode_id( library1.id ),
item_type='library',
@@ -433,7 +433,7 @@
permissions_in = [ k for k, v in galaxy.model.Library.permitted_actions.items() ]
permissions_out = []
# Only admin_user will be permitted for
- # LIBRARY_ACCESS, LIBRARY_ADD, LIBRARY_MODIFY, LIBRARY_MANAGE on library2 and it's contents.
+ # LIBRARY_ACCESS, LIBRARY_ADD, LIBRARY_MODIFY, LIBRARY_MANAGE on library2 and its contents.
self.library_permissions( self.security.encode_id( library1.id ),
library1.name,
str( admin_user_private_role.id ),
@@ -526,7 +526,7 @@
ldda8 = get_latest_ldda_by_name( filename )
assert ldda8 is not None, 'Problem retrieving LibraryDatasetDatasetAssociation ldda8 from the database'
def test_090_make_library2_and_contents_public( self ):
- """Testing making library2 and all of it's contents public"""
+ """Testing making library2 and all of its contents public"""
self.make_library_item_public( self.security.encode_id( library2.id ),
self.security.encode_id( library2.id ),
item_type='library',
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.