1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/a3c018044538/
Changeset: a3c018044538
User: greg
Date: 2013-10-02 22:44:48
Summary: Eliminate the problematic "Select one" option from select fields.
Affected #: 1 file
diff -r e262ddfe44c34200bac86dfab64c7acbdc5c54a3 -r a3c0180445385eb708e03304769599a8c9cc2760 lib/galaxy/web/form_builder.py
--- a/lib/galaxy/web/form_builder.py
+++ b/lib/galaxy/web/form_builder.py
@@ -756,13 +756,6 @@
refresh_on_change=refresh_on_change,
refresh_on_change_values=refresh_on_change_values,
size=size )
- if display is None and initial_value == 'none':
- # Only insert an initial "Select one" option if we are not displaying check boxes
- # or radio buttons and we have not received an initial_value other than 'none'.
- if selected_value == initial_value:
- select_field.add_option( 'Select one', initial_value, selected=True )
- else:
- select_field.add_option( 'Select one', initial_value )
for obj in objs:
if label_attr == 'self':
# Each obj is a string
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/commits/0fc6c5554877/
Changeset: 0fc6c5554877
User: martenson
Date: 2013-10-02 15:39:40
Summary: activation config settings made better
Affected #: 3 files
diff -r 0026e8e49df4273dc9bebcf3475e1873e5e808f3 -r 0fc6c5554877c4389fc074cdfac60fdc12ebcb6e lib/galaxy/config.py
--- a/lib/galaxy/config.py
+++ b/lib/galaxy/config.py
@@ -132,7 +132,7 @@
self.admin_users = kwargs.get( "admin_users", "" )
self.mailing_join_addr = kwargs.get('mailing_join_addr',"galaxy-announce-join(a)bx.psu.edu")
self.error_email_to = kwargs.get( 'error_email_to', None )
- self.admin_email = kwargs.get( 'admin_email', None )
+ self.activation_email = kwargs.get( 'activation_email', None )
self.user_activation_on = kwargs.get( 'user_activation_on', None )
self.activation_grace_period = kwargs.get( 'activation_grace_period', None )
self.inactivity_box_content = kwargs.get( 'inactivity_box_content', None )
@@ -143,10 +143,10 @@
if self.blacklist_location is not None:
self.blacklist_file = resolve_path( kwargs.get( 'blacklist_file', None ), self.root )
try:
- with open(self.blacklist_file) as blacklist:
- self.blacklist_content = [ line.rstrip() for line in blacklist.readlines() ]
+ with open( self.blacklist_file ) as blacklist:
+ self.blacklist_content = [ line.rstrip() for line in blacklist.readlines() ]
except IOError:
- print ( "CONFIGURATION ERROR: Can't open supplied blacklist file from path: " + str( self.blacklist_file ) )
+ print ( "CONFIGURATION ERROR: Can't open supplied blacklist file from path: " + str( self.blacklist_file ) )
self.smtp_server = kwargs.get( 'smtp_server', None )
self.smtp_username = kwargs.get( 'smtp_username', None )
self.smtp_password = kwargs.get( 'smtp_password', None )
diff -r 0026e8e49df4273dc9bebcf3475e1873e5e808f3 -r 0fc6c5554877c4389fc074cdfac60fdc12ebcb6e lib/galaxy/webapps/galaxy/controllers/user.py
--- a/lib/galaxy/webapps/galaxy/controllers/user.py
+++ b/lib/galaxy/webapps/galaxy/controllers/user.py
@@ -491,12 +491,12 @@
message = "No such user (please note that login is case sensitive)"
elif user.deleted:
message = "This account has been marked deleted, contact your local Galaxy administrator to restore the account."
- if trans.app.config.admin_email is not None:
- message += 'Contact: %s' % trans.app.config.admin_email
+ if trans.app.config.error_email_to is not None:
+ message += ' Contact: %s' % trans.app.config.error_email_to
elif user.external:
message = "This account was created for use with an external authentication method, contact your local Galaxy administrator to activate it."
- if trans.app.config.admin_email is not None:
- message += 'Contact: %s' % trans.app.config.admin_email
+ if trans.app.config.error_email_to is not None:
+ message += ' Contact: %s' % trans.app.config.error_email_to
elif not user.check_password( password ):
message = "Invalid password"
elif trans.app.config.user_activation_on and not user.active: # activation is ON and the user is INACTIVE
@@ -536,8 +536,8 @@
message = 'This account has not been activated yet. The activation link has been sent again. Please check your email address %s.<br>' % email
else:
message = 'This account has not been activated yet but we are unable to send the activation link. Please contact your local Galaxy administrator.'
- if trans.app.config.admin_email is not None:
- message += 'Contact: %s' % trans.app.config.admin_email
+ if trans.app.config.error_email_to is not None:
+ message += ' Contact: %s' % trans.app.config.error_email_to
return message
def is_outside_grace_period ( self, trans, create_time ):
@@ -591,8 +591,8 @@
is_admin = cntrller == 'admin' and trans.user_is_admin
if not trans.app.config.allow_user_creation and not trans.user_is_admin():
message = 'User registration is disabled. Please contact your local Galaxy administrator for an account.'
- if trans.app.config.admin_email is not None:
- message += 'Contact: %s' % trans.app.config.admin_email
+ if trans.app.config.error_email_to is not None:
+ message += ' Contact: %s' % trans.app.config.error_email_to
status = 'error'
else:
if not refresh_frames:
@@ -733,8 +733,8 @@
success = True
else:
message = 'Unable to send activation email, please contact your local Galaxy administrator.'
- if trans.app.config.admin_email is not None:
- message += 'Contact: %s' % trans.app.config.admin_email
+ if trans.app.config.error_email_to is not None:
+ message += ' Contact: %s' % trans.app.config.error_email_to
success = False
else: # User activation is OFF, proceed without sending the activation email.
message = 'Now logged in as %s.<br><a target="_top" href="%s">Return to the home page.</a>' % ( user.email, url_for( '/' ) )
@@ -752,7 +752,7 @@
"Activation link: %s \n\n"
"Your Galaxy Team" % ( email, activation_link ))
to = email
- frm = trans.app.config.admin_email
+ frm = trans.app.config.activation_email
subject = 'How to activate your Galaxy account'
try:
util.send_mail( frm, to, subject, body, trans.app.config )
diff -r 0026e8e49df4273dc9bebcf3475e1873e5e808f3 -r 0fc6c5554877c4389fc074cdfac60fdc12ebcb6e universe_wsgi.ini.sample
--- a/universe_wsgi.ini.sample
+++ b/universe_wsgi.ini.sample
@@ -269,11 +269,11 @@
# Datasets in an error state include a link to report the error. Those reports
# will be sent to this address. Error reports are disabled if no address is set.
+# Also this email is shown as a contact to user in case of Galaxy misconfiguration and other events user may encounter.
#error_email_to = None
-# Administrator's email is shown to user in case of Galaxy misconfiguration or a generic error.
-# It is also used as a sender for the account activation mail.
-#admin_email = None
+# Activation email is used as a sender ('from' field) for the account activation mail.
+#activation_email = None
# E-mail domains blacklist is used for filtering out users that are using disposable email address
# during the registration. If their address domain matches any domain in the BL they are refused the registration.
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/commits/0026e8e49df4/
Changeset: 0026e8e49df4
User: greg
Date: 2013-10-02 15:17:52
Summary: Handle errors when attempting to set metadata on a tool shed repository that contains a file with a .ga extension but turns out to not be a valid exported Galaxy workflow.
Affected #: 1 file
diff -r e416f8c710b63d7fc9f682539929e9823c26f041 -r 0026e8e49df4273dc9bebcf3475e1873e5e808f3 lib/tool_shed/util/metadata_util.py
--- a/lib/tool_shed/util/metadata_util.py
+++ b/lib/tool_shed/util/metadata_util.py
@@ -710,8 +710,16 @@
fp = open( relative_path, 'rb' )
workflow_text = fp.read()
fp.close()
- exported_workflow_dict = json.from_json_string( workflow_text )
- if 'a_galaxy_workflow' in exported_workflow_dict and exported_workflow_dict[ 'a_galaxy_workflow' ] == 'true':
+ if workflow_text:
+ valid_exported_galaxy_workflow = True
+ try:
+ exported_workflow_dict = json.from_json_string( workflow_text )
+ except Exception, e:
+ log.exception( "Skipping file %s since it does not seem to be a valid exported Galaxy workflow: %s" \
+ % str( relative_path ), str( e ) )
+ valid_exported_galaxy_workflow = False
+ if valid_exported_galaxy_workflow and \
+ 'a_galaxy_workflow' in exported_workflow_dict and exported_workflow_dict[ 'a_galaxy_workflow' ] == 'true':
metadata_dict = generate_workflow_metadata( relative_path, exported_workflow_dict, metadata_dict )
# Handle any data manager entries
metadata_dict = generate_data_manager_metadata( app,
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/commits/313da0e75a88/
Changeset: 313da0e75a88
User: Dave Bouvier
Date: 2013-10-01 21:49:08
Summary: Remove sam_fa_indices.loc.sample from tool-data. Update migration xml to the correct revisions of cufflinks repositories.
Affected #: 3 files
diff -r 5aef59e6841170aa6e21794d78f709b17738595e -r 313da0e75a88883610cc878bb291b3f9f2d81a9b scripts/migrate_tools/0008_tools.xml
--- a/scripts/migrate_tools/0008_tools.xml
+++ b/scripts/migrate_tools/0008_tools.xml
@@ -15,16 +15,16 @@
<repository owner="devteam" changeset_revision="4a32700dcaa2" name="ctd_batch" description="Galaxy wrappers for the tool CTD: analysis of chemicals, diseases, or genes"><tool id="ctdBatch_1" version="1.0.0" file="ctd.xml" /></repository>
- <repository owner="devteam" changeset_revision="9d35cf35634e" name="cuffcompare" description="Galaxy wrappers for the Cuffcompare tool.">
+ <repository owner="devteam" changeset_revision="9a3f7a890da6" name="cuffcompare" description="Galaxy wrappers for the Cuffcompare tool."><tool id="cuffcompare" version="0.0.5" file="cuffcompare_wrapper.xml" /></repository><repository owner="devteam" changeset_revision="0dabb2ed6eb1" name="cuffdiff" description="Galaxy wrappers for the Cuffdiff tool."><tool id="cuffdiff" version="0.0.6" file="cuffdiff_wrapper.xml" /></repository>
- <repository owner="devteam" changeset_revision="b50aacc8ae49" name="cufflinks" description="Galaxy wrappers for the Cufflinks tool.">
+ <repository owner="devteam" changeset_revision="b01956f26c36" name="cufflinks" description="Galaxy wrappers for the Cufflinks tool."><tool id="cufflinks" version="0.0.6" file="cufflinks_wrapper.xml" /></repository>
- <repository owner="devteam" changeset_revision="dbbd37e013aa" name="cuffmerge" description="Galaxy wrappers for the Cuffmerge tool.">
+ <repository owner="devteam" changeset_revision="fdc55fd74f78" name="cuffmerge" description="Galaxy wrappers for the Cuffmerge tool."><tool id="cuffmerge" version="0.0.5" file="cuffmerge_wrapper.xml" /></repository><repository owner="devteam" changeset_revision="f16000dc644b" name="delete_overlapping_indels" description="Galaxy wrappers for the tool Delete Overlapping Indels: from a chromosome indels file">
diff -r 5aef59e6841170aa6e21794d78f709b17738595e -r 313da0e75a88883610cc878bb291b3f9f2d81a9b tool-data/sam_fa_indices.loc.sample
--- a/tool-data/sam_fa_indices.loc.sample
+++ /dev/null
@@ -1,28 +0,0 @@
-#This is a sample file distributed with Galaxy that enables tools
-#to use a directory of Samtools indexed sequences data files. You will need
-#to create these data files and then create a sam_fa_indices.loc file
-#similar to this one (store it in this directory) that points to
-#the directories in which those files are stored. The sam_fa_indices.loc
-#file has this format (white space characters are TAB characters):
-#
-#index <seq><location>
-#
-#So, for example, if you had hg18 indexed stored in
-#/depot/data2/galaxy/sam/,
-#then the sam_fa_indices.loc entry would look like this:
-#
-#index hg18 /depot/data2/galaxy/sam/hg18.fa
-#
-#and your /depot/data2/galaxy/sam/ directory
-#would contain hg18.fa and hg18.fa.fai files:
-#
-#-rw-r--r-- 1 james universe 830134 2005-09-13 10:12 hg18.fa
-#-rw-r--r-- 1 james universe 527388 2005-09-13 10:12 hg18.fa.fai
-#
-#Your sam_fa_indices.loc file should include an entry per line for
-#each index set you have stored. The file in the path does actually
-#exist, but it should never be directly used. Instead, the name serves
-#as a prefix for the index file. For example:
-#
-#index hg18 /depot/data2/galaxy/sam/hg18.fa
-#index hg19 /depot/data2/galaxy/sam/hg19.fa
diff -r 5aef59e6841170aa6e21794d78f709b17738595e -r 313da0e75a88883610cc878bb291b3f9f2d81a9b tool_data_table_conf.xml.sample
--- a/tool_data_table_conf.xml.sample
+++ b/tool_data_table_conf.xml.sample
@@ -55,11 +55,6 @@
<columns>value, name, path</columns><file path="tool-data/perm_color_index.loc" /></table>
- <!-- Location of SAMTools indexes and other files -->
- <table name="sam_fa_indexes" comment_char="#">
- <columns>line_type, value, path</columns>
- <file path="tool-data/sam_fa_indices.loc" />
- </table><!-- Location of Picard dict file and other files --><table name="picard_indexes" comment_char="#"><columns>value, dbkey, name, path</columns>
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.