- galaxy-commits - lists.galaxyproject.org

galaxy-dist commit 264c608b48d9: Fixed inconsistency in PerM loc.sample files
by commits-noreply＠bitbucket.org 20 Nov '10

20 Nov '10

# HG changeset patch -- Bitbucket.org # Project galaxy-dist # URL http://bitbucket.org/galaxy/galaxy-dist/overview # User Kelly Vincent <kpvincent(a)bx.psu.edu> # Date 1290012220 18000 # Node ID 264c608b48d9b0db2a142d820e32ec1d1fa550dd # Parent 5ec30f459e8e4a1186f666f4879e14f082f17352 Fixed inconsistency in PerM loc.sample files --- a/tool-data/perm_color_index.loc.sample +++ b/tool-data/perm_color_index.loc.sample @@ -13,7 +13,7 @@ #50, and stored in /depot/data/galaxy/phiX/perm_index/, #then the perm_color_index.loc entry would look something like this: # -#phiX_F3_50 phiX: seed=F3, read length=50 /depot/data/galaxy/phiX/perm_index/phiX_color_F3_50.index +#phiX_F3_50 phiX: seed=F3, read length=50 /data/galaxy/phiX/perm_index/phiX_color_F3_50.index # #and your /depot/data/galaxy/phiX/perm_index/ directory #would contain the file phiX_color_F3_50.index: @@ -21,8 +21,8 @@ #Your perm_color_index.loc file should include an entry per line for each #index set you have stored. For example: # -#phiX_F3_50 /depot/data/galaxy/phiX/perm_index/phiX_color_F3_50.index -#phiX_F4_50 /depot/data/galaxy/phiX/perm_index/phiX_color_F3_50.index -#hg19_F3_50 /depot/data/galaxy/hg19/perm_index/hg19_color_F3_50.index -#hg19_F4_50 /depot/data/galaxy/hg19/perm_index/hg19_color_F3_50.index +#phiX_F3_50 phiX: seed=F3, read length=50 /data/galaxy/phiX/perm_index/phiX_color_F3_50.index +#phiX_F4_50 phiX: seed=F4, read length=50 /data/galaxy/phiX/perm_index/phiX_color_F3_50.index +#hg19_F3_50 hg19: seed=F3, read length=50 /data/galaxy/hg19/perm_index/hg19_color_F3_50.index +#hg19_F4_50 hg19: seed=F4, read length=50 /data/galaxy/hg19/perm_index/hg19_color_F3_50.index # --- a/tool-data/perm_base_index.loc.sample +++ b/tool-data/perm_base_index.loc.sample @@ -21,8 +21,7 @@ #Your perm_base_index.loc file should include an entry per line for each #index set you have stored. For example: # -#phiX_F3_50 /depot/data/galaxy/phiX/perm_index/phiX_base_F3_50.index -#phiX_F4_50 /depot/data/galaxy/phiX/perm_index/phiX_base_F3_50.index -#hg19_F3_50 /depot/data/galaxy/hg19/perm_index/hg19_base_F3_50.index -#hg19_F4_50 /depot/data/galaxy/hg19/perm_index/hg19_base_F3_50.index -# +#phiX_F3_50 phiX: seed=F3, read length=50 /data/galaxy/phiX/perm_index/phiX_base_F3_50.index +#phiX_F4_50 phiX: seed=F4, read length=50 /data/galaxy/phiX/perm_index/phiX_base_F3_50.index +#hg19_F3_50 hg19: seed=F3, read length=50 /data/galaxy/hg19/perm_index/hg19_base_F3_50.index +#hg19_F4_50 hg19: seed=F4, read length=50 /data/galaxy/hg19/perm_index/hg19_base_F3_50.index

1 0

galaxy-dist commit d1baa724b393: Modified some test fastq files to make valid
by commits-noreply＠bitbucket.org 20 Nov '10

20 Nov '10

# HG changeset patch -- Bitbucket.org # Project galaxy-dist # URL http://bitbucket.org/galaxy/galaxy-dist/overview # User Kelly Vincent <kpvincent(a)bx.psu.edu> # Date 1290011865 18000 # Node ID d1baa724b393de6871df7249ebe35ecfe2054e31 # Parent 39f41821aa4eec15b04509d24715946552bb14a6 Modified some test fastq files to make valid --- a/test-data/bwa_wrapper_in2.fastq +++ b/test-data/bwa_wrapper_in2.fastq @@ -1,120 +1,120 @@ @seq1/1 GGACTCAGATAGTAATCC -+/1 ++ II#IIIIIII$5+.(9II @seq2/1 ATTCGACCTATCCTTGCG -+/1 ++ IIIIIIIIIIIIIIIIII @seq3/1 GTAACAAAGTTTGGATTG -+/1 ++ IIIIIIIIIIIIIIIIII @seq4/1 AGCCGCTCGTCTTTTATG -+/1 ++ IIIIIIIIIIIIIIIIII @seq5/1 CAGTTATATGGCTTTTGG -+/1 ++ IIIIIIIIIIIIIIIIII @seq6/1 AGGCGCTCGTCTTGGTAT -+/1 ++ IIIIIIIIIIIIIIIIII @seq7/1 TGTAGGTGGTCAACCAAT -+/1 ++ IIIIIIIIIIIIIIIIII @seq8/1 ACACCCGTCCTTTACGTC -+/1 ++ IIIIIIIIIIIIIIIIII @seq9/1 GCCGCTATTCAGGTTGTT -+/1 ++ IIIIIIIIIIIIIIIIII @seq10/1 ATTCTTTCTTTTCGTATC -+/1 ++ IIIIIIIIIIIIIIIIII @seq11/1 GCATTTCTACTCCTTCTC -+/1 ++ II#IIIIIII$5+.(9II @seq12/1 CGCGCTTCGATAAAAATG -+/1 ++ IIIIIIIIIIIIIIIIII @seq13/1 ATTTCTACTCTTTCTCAT -+/1 ++ IIIIIIIIIIIIIIIIII @seq14/1 CCCTTTTGAATGTCACGC -+/1 ++ IIIIIIIIIIIIIIIIII @seq15/1 CCAACTTACCAAGGTGGG -+/1 ++ IIIIIIIIIIIIIIIIII @seq16/1 TCAGGGTATTAAAAGAGA -+/1 ++ IIIIIIIIIIIIIIIIII @seq17/1 GTGATGTGCTTGCTACCG -+/1 ++ IIIIIIIIIIIIIIIIII @seq18/1 TCAATCCCCCATGCTTGG -+/1 ++ IIIIIIIIIIIIIIIIII @seq19/1 TTCCTGCGCTTAATGCTT -+/1 ++ IIIIIIIIIIIIIIIIII @seq20/1 CTTATTACCATTTCAACT -+/1 ++ IIIIIIIIIIIIIIIIII @seq21/1 CTGATACCAATAAAACCC -+/1 ++ II#IIIIIII$5+.(9II @seq22/1 AATCAAACTTACCAAGGG -+/1 ++ IIIIIIIIIIIIIIIIII @seq23/1 TGTGCTTCCCCAACTTGA -+/1 ++ IIIIIIIIIIIIIIIIII @seq24/1 TTTCTCAATCCCCAATGC -+/1 ++ IIIIIIIIIIIIIIIIII @seq25/1 TTGCTACTGACCGCTCTT -+/1 ++ IIIIIIIIIIIIIIIIII @seq26/1 CCGCGTGAAATTTCTATG -+/1 ++ IIIIIIIIIIIIIIIIII @seq27/1 CGCTAATCAAGTTGTTTC -+/1 ++ IIIIIIIIIIIIIIIIII @seq28/1 AAAGAGATTATTTGTCGG -+/1 ++ IIIIIIIIIIIIIIIIII @seq29/1 CAAATTAATGCGCGCTTC -+/1 ++ IIIIIIIIIIIIIIIIII @seq30/1 ATCCCCTATGCTTGGCTT -+/1 ++ IIIIIIIIIIIIIIIIII --- a/test-data/bwa_wrapper_in3.fastq +++ b/test-data/bwa_wrapper_in3.fastq @@ -1,74 +1,74 @@ @seq1/2 ACGCTCCTTTAAAATATC -+/2 ++ IIIII$%*$G$A31I&&B @seq2/2 CAGCTCGAGAAGCTCTTA -+/2 ++ IIIIIIIIIIIIIIIIII @seq3/2 CTACTGACCGCTCTCGTG -+/2 ++ IIIIIIIIIIIIIIIIII @seq4/2 TAGGTGGTCAACCATTTT -+/2 ++ IIIIIIIIIIIIIIIIII @seq5/2 TTTCTATGTGGCTTAATA -+/2 ++ IIIIIIIIIIIIIIIIII @seq6/2 GTAGGTGGTCAACAATTT -+/2 ++ IIIIIIIIIIIIIIIIII @seq7/2 TTTAATTGCAGGGGCTTC -+/2 ++ IIIIIIIIIIIIIIIIII @seq8/2 ATGCGCTCTATTCTCTGG -+/2 ++ IIIIIIIIIIIIIIIIII @seq9/2 TTCTGTTGGTGCTGATAT -+/2 ++ IIIIIIIIIIIIIIIIII @seq10/2 AGGGCGTTGAGTTCGATA -+/2 ++ IIIIIIIIIIIIIIIIII @seq11/2 ATCCCCAATGCTTGGCTT -+/2 ++ IIIII$%*$G$A31I&&B @seq12/2 GGATTGGCGTTTCCAACC -+/2 ++ IIIIIIIIIIIIIIIIII @seq13/2 CCCCAATCCTTGCCTTCC -+/2 ++ IIIAAIIIIIIIIIIIII @seq14/2 TGATATTTTGACTTTGAG -+/2 ++ IIIIIIIIIIIIIIIIII @seq15/2 TTACGAAACGCGACGCCG -+/2 ++ IIIIIIIIIIIIIIIIII @seq16/2 TTATTTTTCTCCAGCCAC -+/2 ++ IIIIIIIIIIIIIIIIII @seq17/2 AAACAATACTTTAGGCAT -+/2 ++ IIIIIIIIIIIIIIIIII @seq18/2 CCGTTCCATAAGCAGATG -+/2 ++ IIIIIIIIIIIIIIIIII @seq19/2 GAGCGTCCTGGTGCTGAT @@ -76,45 +76,45 @@ GAGCGTCCTGGTGCTGAT IIIIIIIIIIIIIIIIII @seq20/2 ACTCCGGTTATCGCTGGC -+/2 ++ IIIIIIIIIIIIIIIIII @seq21/2 TAAGCATTTGGTTCAGGG -+/2 ++ IIIII$%*$G$A31I&&B @seq22/2 GTTACGACGCGACGCCGT -+/2 ++ IIIIIIIIIIIIIIIIII @seq23/2 TTTAATAACCCTATAGAC -+/2 ++ IIIIIIIIIIIIIIIIII @seq24/2 CTTGGCTTCCCTAAGCAG -+/2 ++ IIIIIIIIIIIIIIIIII @seq25/2 CGTGCTCGTTGCTGCGTT -+/2 ++ IIIIIIIIIIIIIIIIII @seq26/2 AAGGATGTTTTCCGTTCT -+/2 ++ IIIIIIIIIIIIIIIIII @seq27/2 TGTTTGGTGCTGATATTG -+/2 ++ IIIIIIIIIIIIIIIIII @seq28/2 TCCAGCCACTAAAGTGAG -+/2 ++ IIIIIIIIIIIIIIIIII @seq29/2 GATAATGATTGGGGTATC -+/2 ++ IIIIIIIIIIIIIIIIII @seq30/2 ACCATAAGCAGATGGATA -+/2 ++ IIIIIIIIIIIIIIIIII --- a/test-data/bowtie_in2.fastqsanger +++ b/test-data/bowtie_in2.fastqsanger @@ -1,5 +1,5 @@ @HWI-EAS91_1_30788AAXX:1:1:1513:715/1 GTTTTTTNNGCATAGATGTTTAGTTGTGGTAGTCAG -+/1 ++ IIIIIII""IIIIIIIIIIIIIIIIIIIDI?II-+I

1 0

galaxy-dist commit 7d46c23bb276: Merge with 39f41821aa4eec15b04509d24715946552bb14a6
by commits-noreply＠bitbucket.org 20 Nov '10

20 Nov '10

# HG changeset patch -- Bitbucket.org # Project galaxy-dist # URL http://bitbucket.org/galaxy/galaxy-dist/overview # User rc # Date 1290011867 18000 # Node ID 7d46c23bb276790160fe05560aa87c3d41185a27 # Parent 8ce82d60b2ab55966d133db136fcb2f809201c4b # Parent 39f41821aa4eec15b04509d24715946552bb14a6 Merge with 39f41821aa4eec15b04509d24715946552bb14a6

1 0

galaxy-dist commit 5ec30f459e8e: Merge with d1baa724b393de6871df7249ebe35ecfe2054e31
by commits-noreply＠bitbucket.org 20 Nov '10

20 Nov '10

# HG changeset patch -- Bitbucket.org # Project galaxy-dist # URL http://bitbucket.org/galaxy/galaxy-dist/overview # User rc # Date 1290011973 18000 # Node ID 5ec30f459e8e4a1186f666f4879e14f082f17352 # Parent 7d46c23bb276790160fe05560aa87c3d41185a27 # Parent d1baa724b393de6871df7249ebe35ecfe2054e31 Merge with d1baa724b393de6871df7249ebe35ecfe2054e31

1 0

galaxy-dist commit 19b10fff1335: More bug fixes.
by commits-noreply＠bitbucket.org 20 Nov '10

20 Nov '10

# HG changeset patch -- Bitbucket.org # Project galaxy-dist # URL http://bitbucket.org/galaxy/galaxy-dist/overview # User Greg Von Kuster <greg(a)bx.psu.edu> # Date 1290010215 18000 # Node ID 19b10fff133595cb5cd1851a7f24024c2637ad2b # Parent 918a25ed14f5427f70970b0c436159fc58fd111e More bug fixes. --- a/lib/galaxy/web/controllers/forms.py +++ b/lib/galaxy/web/controllers/forms.py @@ -602,7 +602,7 @@ class Forms( BaseController ): self.fieldtype.add_option( ft.__name__, ft.__name__ ) else: for ft in trans.model.FormDefinition.supported_field_types: - self.fieldtype.add_option( ft.__name__, ft__name__ ) + self.fieldtype.add_option( ft.__name__, ft.__name__ ) self.required = SelectField('field_required_'+str(index), display='radio') self.required.add_option('Required', 'required') self.required.add_option('Optional', 'optional', selected=True) @@ -713,7 +713,7 @@ class Forms( BaseController ): form_details=form_details, field_details=field_details, form_definition=form_definition, - field_types=BaseField.form_field_types(), + field_types=trans.model.FormDefinition.supported_field_types, message=message, status=status, current_form_type=current_form[ 'type' ],

1 0

galaxy-dist commit 8ce82d60b2ab: - added the change data library sample operation functional test.
by commits-noreply＠bitbucket.org 20 Nov '10

20 Nov '10

# HG changeset patch -- Bitbucket.org # Project galaxy-dist # URL http://bitbucket.org/galaxy/galaxy-dist/overview # User rc # Date 1290011634 18000 # Node ID 8ce82d60b2ab55966d133db136fcb2f809201c4b # Parent 19b10fff133595cb5cd1851a7f24024c2637ad2b - added the change data library sample operation functional test. - renaming dataset now checks for incorrect filename characters - fixed bugs --- a/lib/galaxy/web/controllers/requests_common.py +++ b/lib/galaxy/web/controllers/requests_common.py @@ -1079,7 +1079,7 @@ class RequestsCommon( BaseController, Us cntrller=cntrller, action='update_request_state', request_id=trans.security.encode_id( request.id ) ) ) - elif sample_operation == trans.model.sample.bulk_operations.SELECT_LIBRARY: + elif sample_operation == trans.model.Sample.bulk_operations.SELECT_LIBRARY: # TODO: fix the code so that the sample_operation_select_field does not use # sample_0_library_id as it's name. it should use something like sample_operation_library_id # and sample_operation_folder_id because the name sample_0_library_id should belong to the --- a/templates/admin/requests/rename_datasets.mako +++ b/templates/admin/requests/rename_datasets.mako @@ -16,6 +16,7 @@ <div class="toolForm"><form name="rename_datasets" id="rename_datasets" action="${h.url_for( controller='requests_admin', action='rename_datasets', id_list=id_list, sample_id=trans.security.encode_id( sample.id ) )}" method="post" > + <table class="grid"><thead><tr> @@ -43,9 +44,16 @@ </tbody></table><br/> + <div class="form-row"> + <div class="toolParamHelp" style="clear: both;"> + A dataset name should only contain the alphanumeric characters or underscore(_). + If a dataset name contains any other character, it would be replaced by an underscore(_). + </div> + </div><div class="form-row"><input type="submit" name="rename_datasets_button" value="Save"/><input type="submit" name="cancel_rename_datasets_button" value="Close"/></div></form> + </div> --- a/scripts/galaxy_messaging/server/setup_rabbitmq.py +++ b/scripts/galaxy_messaging/server/setup_rabbitmq.py @@ -24,7 +24,7 @@ def main( config_file ): cmd_list = [ 'add_user %s %s' % ( username, password ), - 'add_vhost %s' % config.get( 'galaxy_amqp', 'virtual_host' ), + 'add_vhost %s' % virtual_host, 'set_permissions -p %s %s ".*" ".*" ".*"' % ( virtual_host, username ) ] --- a/test/functional/test_sample_tracking.py +++ b/test/functional/test_sample_tracking.py @@ -430,8 +430,8 @@ class TestFormsAndRequests( TwillTestCas """Testing editing the sample information of new request1""" # logged in as regular_user1 # target data library - change it to library1 - target_library_info = dict(library=self.security.encode_id(library1.id), - folder=self.security.encode_id(library1_folder1.id) ) + target_library_info = dict(library=self.security.encode_id( library1.id ), + folder=self.security.encode_id( library1_folder1.id ) ) new_sample_value_tuples = \ [ ( 'Sample1_renamed', target_library_info, [ 'option2', 'sample1 field2 value edited', 'sample1 field3 value edited' ] ), ( 'Sample2_renamed', target_library_info, [ 'option1', 'sample2 field2 value edited', 'sample2 field3 value edited' ] ), @@ -494,6 +494,23 @@ class TestFormsAndRequests( TwillTestCas strings_displayed_count=strings_displayed_count, strings_not_displayed=[ request1.states.COMPLETE, request1.states.REJECTED ] ) + # change the target data library back to library2 using sample operation user interface + self.change_sample_target_data_library( cntrller='requests', + request_id=self.security.encode_id( request1.id ), + sample_ids=[ sample.id for sample in request1.samples ], + new_library_id=self.security.encode_id( library2.id ), + new_folder_id=self.security.encode_id( library2_folder1.id ), + strings_displayed=[ 'Edit Current Samples of Sequencing Request "%s"' % request1.name ], + strings_displayed_after_submit=[ 'Changes made to the samples have been saved.' ] ) + # check the changed target data library & folder on the request page + strings_displayed_count = [] + strings_displayed_count.append( ( library2.name, len( request1.samples ) ) ) + strings_displayed_count.append( ( library2_folder1.name, len( request1.samples ) ) ) + self.view_request( cntrller='requests', + request_id=self.security.encode_id( request1.id ), + strings_displayed=[], + strings_displayed_count=strings_displayed_count ) + # # ====== Sequencing request test methods - Admin perspective ================ # @@ -537,7 +554,7 @@ class TestFormsAndRequests( TwillTestCas request1.type.states[4].desc ] # check history of each sample for sample in request1.samples: - strings_displayed = [ 'Events for Sample "%s"' % sample.name, + strings_displayed = [ 'History of sample "%s"' % sample.name, 'Sequencing request submitted and sample state set to %s' % request1.type.states[0].name, request1.type.states[0].name, request1.type.states[1].name ] --- a/lib/galaxy/web/controllers/requests_admin.py +++ b/lib/galaxy/web/controllers/requests_admin.py @@ -361,17 +361,29 @@ class RequestsAdmin( BaseController, Use sample_dataset = trans.sa_session.query( trans.app.model.SampleDataset ).get( trans.security.decode_id( sample_dataset_id ) ) sample_datasets.append( sample_dataset ) if params.get( 'rename_datasets_button', False ): + incorrect_dataset_names = [] for sample_dataset in sample_datasets: encoded_id = trans.security.encode_id( sample_dataset.id ) selected_option = util.restore_text( params.get( 'rename_datasets_for_sample_%s' % encoded_id, '' ) ) new_name = util.restore_text( params.get( 'new_name_%s' % encoded_id, '' ) ) + if not new_name: + incorrect_dataset_names.append( sample_dataset.name ) + continue + new_name = util.sanitize_for_filename( new_name ) if selected_option == 'none': sample_dataset.name = new_name else: sample_dataset.name = '%s_%s' % ( selected_option, new_name ) trans.sa_session.add( sample_dataset ) trans.sa_session.flush() - message = 'Changes saved successfully.' + if len( sample_datasets ) == len( incorrect_dataset_names ): + status = 'error' + message = 'All datasets renamed incorrectly.' + elif len( incorrect_dataset_names ): + status = 'done' + message = 'Changes saved successfully. The following datasets were renamed incorrectly: %s.' % str( incorrect_dataset_names ) + else: + message = 'Changes saved successfully.' return trans.fill_template( '/admin/requests/rename_datasets.mako', sample=sample, id_list=id_list, --- a/test/base/twilltestcase.py +++ b/test/base/twilltestcase.py @@ -1638,6 +1638,23 @@ class TwillTestCase( unittest.TestCase ) tc.submit( "save_samples_button" ) for check_str in strings_displayed_after_submit: self.check_page_for_string( check_str ) + def change_sample_target_data_library( self, cntrller, request_id, sample_ids, new_library_id, new_folder_id, comment='', strings_displayed=[], strings_displayed_after_submit=[] ): + url = "%s/requests_common/edit_samples?cntrller=%s&id=%s&editing_samples=True" % ( self.url, cntrller, request_id ) + self.visit_url( url ) + for check_str in strings_displayed: + self.check_page_for_string( check_str ) + for sample_id in sample_ids: + tc.fv( "1", "select_sample_%i" % sample_id, True ) + tc.fv( "1", "sample_operation", 'Select data library and folder' ) + self.refresh_form( "sample_operation", 'Select data library and folder' ) + self.check_page_for_string( "Select data library:" ) + tc.fv( "1", "sample_0_library_id", new_library_id ) + self.refresh_form( "sample_0_library_id", new_library_id ) + self.check_page_for_string( "Select folder:" ) + tc.fv( "1", "sample_0_folder_id", new_folder_id ) + tc.submit( "save_samples_button" ) + for check_str in strings_displayed_after_submit: + self.check_page_for_string( check_str ) def add_user_address( self, user_id, address_dict ): self.home() self.visit_url( "%s/user/new_address?admin_view=False&user_id=%i" % ( self.url, user_id ) ) --- a/lib/galaxy/web/controllers/forms.py +++ b/lib/galaxy/web/controllers/forms.py @@ -635,8 +635,8 @@ class Forms( BaseController ): if form_type == trans.model.FormDefinition.types.SAMPLE: for ft in trans.model.Sample.supported_field_types: if ft.__name__ == field[ 'type' ]: - self.fieldtype.add_option( ft.__name__, ft__name__, selected=True ) - if ft == 'SelectField': + self.fieldtype.add_option( ft.__name__, ft.__name__, selected=True ) + if ft.__name__ == 'SelectField': self.selectbox_ui( field ) else: self.fieldtype.add_option( ft.__name__, ft.__name__ ) @@ -644,7 +644,7 @@ class Forms( BaseController ): for ft in trans.model.FormDefinition.supported_field_types: if ft.__name__ == field[ 'type' ]: self.fieldtype.add_option( ft.__name__, ft.__name__, selected=True ) - if ft == 'SelectField': + if ft.__name__ == 'SelectField': self.selectbox_ui( field ) else: self.fieldtype.add_option( ft.__name__, ft.__name__ )

1 0

galaxy-dist commit 29227c9c5992: Relax GTF sniffer ever so slightly so that Ensembl GTF files are sniffed correctly.
by commits-noreply＠bitbucket.org 20 Nov '10

20 Nov '10

# HG changeset patch -- Bitbucket.org # Project galaxy-dist # URL http://bitbucket.org/galaxy/galaxy-dist/overview # User jeremy goecks <jeremy.goecks(a)emory.edu> # Date 1290019719 18000 # Node ID 29227c9c599292f7608e61cdd4b2be424b7a7bfc # Parent 1ee9e2490e1968957f5f440a9dd08fb75aa3eb70 Relax GTF sniffer ever so slightly so that Ensembl GTF files are sniffed correctly. --- a/lib/galaxy/datatypes/interval.py +++ b/lib/galaxy/datatypes/interval.py @@ -965,7 +965,9 @@ class Gtf( Gff ): if len( attributes ) >= 2: try: # Imprecise: should check for a single space per the spec. - attr_name, attr_value = attributes[0].split(" ") + # strip() needed b/c Ensembl GTF files include an (illegal) + # space before attributes string. + attr_name, attr_value = attributes[0].strip().split(" ") if attr_name != 'gene_id': return False except:

1 0

galaxy-dist commit 39f41821aa4e: Adding data table configuration file for backwards compatibility with local installs: for people who don't want to update loc file style (changes made in rev 4550:535d276c92bc)
by commits-noreply＠bitbucket.org 20 Nov '10

20 Nov '10

# HG changeset patch -- Bitbucket.org # Project galaxy-dist # URL http://bitbucket.org/galaxy/galaxy-dist/overview # User Kelly Vincent <kpvincent(a)bx.psu.edu> # Date 1290011565 18000 # Node ID 39f41821aa4eec15b04509d24715946552bb14a6 # Parent 19b10fff133595cb5cd1851a7f24024c2637ad2b Adding data table configuration file for backwards compatibility with local installs: for people who don't want to update loc file style (changes made in rev 4550:535d276c92bc) --- /dev/null +++ b/tool_data_table_conf.xml.oldlocstyle @@ -0,0 +1,73 @@ + +<tables> +  + <table name="all_fasta" comment_char="#"> + <columns>value, dbkey, name, path</columns> + <file path="tool-data/all_fasta.loc" /> + </table> +  + <table name="bfast_indexes" comment_char="#"> + <columns>value, dbkey, formats, name, path</columns> + <file path="tool-data/bfast_indexes.loc" /> + </table> +  + <table name="blastdb" comment_char="#"> + <columns>name, value</columns> + <file path="tool-data/blastdb.loc" /> + </table> +  + <table name="blastdb_p" comment_char="#"> + <columns>name, value</columns> + <file path="tool-data/blastdb_p.loc" /> + </table> +  + <table name="bowtie_indexes" comment_char="#"> + <columns>name, value</columns> + <file path="tool-data/bowtie_indices.loc" /> + </table> +  + <table name="bowtie_indexes_color" comment_char="#"> + <columns>name, value</columns> + <file path="tool-data/bowtie_indices_color.loc" /> + </table> +  + <table name="bwa_indexes" comment_char="#"> + <columns>name, value</columns> + <file path="tool-data/bwa_index.loc" /> + </table> +  + <table name="indexed_maf_files"> + <columns>name, value, dbkey, species</columns> + <file path="tool-data/maf_index.loc" /> + </table> +  + <table name="ngs_sim_fasta" comment_char="#"> + <columns>value, dbkey, name, path</columns> + <file path="tool-data/ngs_sim_fasta.loc" /> + </table> +  + <table name="lastz_seqs" comment_char="#"> + <columns>name, value</columns> + <file path="tool-data/lastz_seqs.loc" /> + </table> +  + <table name="perm_base_indexes" comment_char="#"> + <columns>name, value</columns> + <file path="tool-data/perm_base_index.loc" /> + </table> +  + <table name="perm_color_indexes" comment_char="#"> + <columns>name, value</columns> + <file path="tool-data/perm_color_index.loc" /> + </table> +  + <table name="srma_indexes" comment_char="#"> + <columns>name, value</columns> + <file path="tool-data/srma_index.loc" /> + </table> +  + <table name="tophat_indexes" comment_char="#"> + <columns>name, value</columns> + <file path="tool-data/bowtie_indices.loc" /> + </table> +</tables>

1 0

galaxy-dist commit 1bf064c8ab88: Fixed functional tests and samples grid alignment bug
by commits-noreply＠bitbucket.org 20 Nov '10

20 Nov '10

# HG changeset patch -- Bitbucket.org # Project galaxy-dist # URL http://bitbucket.org/galaxy/galaxy-dist/overview # User rc # Date 1289928056 18000 # Node ID 1bf064c8ab88621dd58890f6cd56ad4900d10d6b # Parent 2e2ee0289d67d244954aa05bfe315dbb5ff413eb Fixed functional tests and samples grid alignment bug --- a/test/functional/test_sample_tracking.py +++ b/test/functional/test_sample_tracking.py @@ -341,7 +341,7 @@ class TestFormsAndRequests( TwillTestCas request_id=self.security.encode_id( request1.id ), strings_displayed=[ 'History of sequencing request "%s"' % request1.name, request1.states.NEW, - 'Request created' ], + 'Sequencing request created' ], strings_not_displayed=[ request1.states.SUBMITTED, request1.states.COMPLETE, request1.states.REJECTED ] ) @@ -412,7 +412,7 @@ class TestFormsAndRequests( TwillTestCas self.add_samples( cntrller='requests', request_id=self.security.encode_id( request1.id ), sample_value_tuples=sample_value_tuples, - strings_displayed=[ 'Add Samples to Request "%s"' % request1.name, + strings_displayed=[ 'Add Samples to Sequencing Request "%s"' % request1.name, '<input type="text" name="sample_0_name" value="Sample_1" size="10"/>' ], # sample name input field strings_displayed_after_submit=strings_displayed_after_submit ) # check the new sample field values on the request page @@ -446,7 +446,7 @@ class TestFormsAndRequests( TwillTestCas self.edit_samples( cntrller='requests', request_id=self.security.encode_id( request1.id ), sample_value_tuples=new_sample_value_tuples, - strings_displayed=[ 'Edit Current Samples of Request "%s"' % request1.name, + strings_displayed=[ 'Edit Current Samples of Sequencing Request "%s"' % request1.name, '<input type="text" name="sample_0_name" value="Sample1" size="10"/>' ], # sample name input field strings_displayed_after_submit=strings_displayed_after_submit ) # check the changed sample field values on the request page @@ -465,14 +465,14 @@ class TestFormsAndRequests( TwillTestCas self.submit_request( cntrller='requests', request_id=self.security.encode_id( request1.id ), request_name=request1.name, - strings_displayed_after_submit=[ 'The request has been submitted.' ] ) + strings_displayed_after_submit=[ 'The sequencing request has been submitted.' ] ) refresh( request1 ) # Make sure the request is showing in the 'submitted' filter self.check_request_grid( cntrller='requests', state=request1.states.SUBMITTED, strings_displayed=[ request1.name ] ) # Make sure the request's state is now set to 'submitted' - assert request1.state is not request1.states.SUBMITTED, "The state of the request '%s' should be set to '%s'" \ + assert request1.state is not request1.states.SUBMITTED, "The state of the sequencing request '%s' should be set to '%s'" \ % ( request1.name, request1.states.SUBMITTED ) # the sample state should appear once for each sample strings_displayed_count = [ ( request1.type.states[0].name, len( request1.samples ) ) ] @@ -485,8 +485,8 @@ class TestFormsAndRequests( TwillTestCas strings_displayed_count=strings_displayed_count, strings_not_displayed=strings_not_displayed ) strings_displayed=[ 'History of sequencing request "%s"' % request1.name, - 'Request submitted by %s' % regular_user1.email, - 'Request created' ] + 'Sequencing request submitted by %s' % regular_user1.email, + 'Sequencing request created' ] strings_displayed_count = [ ( request1.states.SUBMITTED, 1 ) ] self.view_request_history( cntrller='requests', request_id=self.security.encode_id( request1.id ), @@ -519,7 +519,7 @@ class TestFormsAndRequests( TwillTestCas self.add_bar_codes( cntrller='requests_admin', request_id=self.security.encode_id( request1.id ), bar_codes=bar_codes, - strings_displayed=[ 'Edit Current Samples of Request "%s"' % request1.name ], + strings_displayed=[ 'Edit Current Samples of Sequencing Request "%s"' % request1.name ], strings_displayed_after_submit=strings_displayed_after_submit ) # the second sample state should appear once for each sample strings_displayed_count = [ ( request1.type.states[1].name, len( request1.samples ) ), @@ -538,7 +538,7 @@ class TestFormsAndRequests( TwillTestCas # check history of each sample for sample in request1.samples: strings_displayed = [ 'Events for Sample "%s"' % sample.name, - 'Request submitted and sample state set to %s' % request1.type.states[0].name, + 'Sequencing request submitted and sample state set to %s' % request1.type.states[0].name, request1.type.states[0].name, request1.type.states[1].name ] self.view_sample_history( cntrller='requests_admin', @@ -558,9 +558,9 @@ class TestFormsAndRequests( TwillTestCas if index > 1: # status message if index == len( request_type1.states ) - 1: - status_msg = 'All samples of this request are in the final sample state (%s).' % state.name + status_msg = 'All samples of this sequencing request are in the final sample state (%s).' % state.name else: - status_msg = 'All samples of this request are in the (%s) sample state. ' % state.name + status_msg = 'All samples of this sequencing request are in the (%s) sample state. ' % state.name # check email notification message email_msg = '' if state.id in [ email_state.id for email_state in email_notification_sample_states ]: @@ -568,7 +568,7 @@ class TestFormsAndRequests( TwillTestCas self.change_sample_state( request_id=self.security.encode_id( request1.id ), sample_ids=[ sample.id for sample in request1.samples ], new_sample_state_id=self.security.encode_id( state.id ), - strings_displayed=[ 'Edit Current Samples of Request "%s"' % request1.name ], + strings_displayed=[ 'Edit Current Samples of Sequencing Request "%s"' % request1.name ], strings_displayed_after_submit = [ status_msg, email_msg ] ) # check request history page if index == len( request_type1.states ) - 1: @@ -584,7 +584,7 @@ class TestFormsAndRequests( TwillTestCas self.check_request_grid( cntrller='requests_admin', state='Complete', strings_displayed=[ request1.name ] ) - assert request1.state is not request1.states.COMPLETE, "The state of the request '%s' should be set to '%s'" \ + assert request1.state is not request1.states.COMPLETE, "The state of the sequencing request '%s' should be set to '%s'" \ % ( request1.name, request1.states.COMPLETE ) # def test_045_admin_create_request_on_behalf_of_regular_user( self ): --- a/templates/requests/common/common.mako +++ b/templates/requests/common/common.mako @@ -113,27 +113,23 @@ </script></%def> -<%def name="render_editable_sample_row( cntrller, sample, sample_widget_index, sample_widget, encoded_selected_sample_ids )"> +<%def name="render_editable_sample_row( cntrller, request, sample, sample_widget_index, sample_widget, encoded_selected_sample_ids )"><% + trans.sa_session.refresh( request ) is_admin = cntrller == 'requests_admin' and trans.user_is_admin() + is_rejected = request.is_rejected + is_complete = request.is_complete + is_submitted = request.is_submitted + is_unsubmitted = request.is_unsubmitted if sample: - trans.sa_session.refresh( sample.request ) - is_complete = sample.request.is_complete - is_rejected = request.is_rejected - is_submitted = sample.request.is_submitted - is_unsubmitted = sample.request.is_unsubmitted can_delete_samples = editing_samples and request.samples and ( ( is_admin and not is_complete ) or is_unsubmitted ) display_checkboxes = editing_samples and ( is_complete or is_rejected or is_submitted ) - display_bar_code = request.samples and ( is_complete or is_rejected or is_submitted ) display_datasets = request.samples and ( is_complete or is_submitted ) else: - is_complete = False - is_submitted = False - is_unsubmitted = False can_delete_samples = False display_checkboxes = False - display_bar_code = False display_datasets = False + display_bar_code = request.samples and ( is_complete or is_rejected or is_submitted ) %><% if display_checkboxes and trans.security.encode_id( sample.id ) in encoded_selected_sample_ids: @@ -152,15 +148,13 @@ </td> %if display_bar_code: <td valign="top"> - %if is_admin: + %if is_admin and is_submitted: <input type="text" name="sample_${sample_widget_index}_bar_code" value="${sample_widget['bar_code']}" size="10"/> %else: ${sample_widget['bar_code']} <input type="hidden" name="sample_${sample_widget_index}_bar_code" value="${sample_widget['bar_code']}"/> %endif </td> - %else: - <td></td> %endif %if sample: %if is_unsubmitted: @@ -305,7 +299,7 @@ sample = None %> %if editing_samples: - <tr>${render_editable_sample_row( cntrller, sample, sample_widget_index, sample_widget, encoded_selected_sample_ids )}</tr> + <tr>${render_editable_sample_row( cntrller, request, sample, sample_widget_index, sample_widget, encoded_selected_sample_ids )}</tr> %elif sample: <tr><td> @@ -401,7 +395,7 @@ </tr> %else: ## The Add sample button was clicked for this sample_widget - <tr>${render_editable_sample_row( cntrller, None, sample_widget_index, sample_widget, encoded_selected_sample_ids )}</tr> + <tr>${render_editable_sample_row( cntrller, request, None, sample_widget_index, sample_widget, encoded_selected_sample_ids )}</tr> %endif %endfor </tbody>

1 0

galaxy-dist commit 7bded9108bd8: More miscellaneous Sample Tracking cleanup and bug fixes, move supported form_builder field types from form_builder.BaseField to Request.model and Sample.model.
by commits-noreply＠bitbucket.org 20 Nov '10

20 Nov '10

# HG changeset patch -- Bitbucket.org # Project galaxy-dist # URL http://bitbucket.org/galaxy/galaxy-dist/overview # User Greg Von Kuster <greg(a)bx.psu.edu> # Date 1290007512 18000 # Node ID 7bded9108bd8297ea609e9ec06bbe516b5f0b83a # Parent a68c74ec8cfbc641db4b6fe424e3f77b9f3c5d3c More miscellaneous Sample Tracking cleanup and bug fixes, move supported form_builder field types from form_builder.BaseField to Request.model and Sample.model. --- a/templates/admin/requests/edit_request_type.mako +++ b/templates/admin/requests/edit_request_type.mako @@ -28,7 +28,7 @@ </div><div class="form-row"><label> - Sequencing Request Form definition: + Sequencing request form definition: </label><select name="form_id"> %for form in forms: @@ -42,7 +42,7 @@ </div><div class="form-row"><label> - Sample Form definition: + Sample form definition: </label><select name="form_id"> %for form in forms: --- a/lib/galaxy/web/form_builder.py +++ b/lib/galaxy/web/form_builder.py @@ -18,12 +18,6 @@ class BaseField(object): return ' disabled="disabled"' else: return '' - @staticmethod - def form_field_types(): - return ['TextField', 'TextArea', 'SelectField', 'CheckboxField', 'AddressField', 'WorkflowField'] - @staticmethod - def sample_field_types(): - return ['TextField', 'SelectField', 'CheckboxField', 'WorkflowField'] class TextField(BaseField): """ @@ -559,8 +553,8 @@ class AddressField(BaseField): self.select_address.add_option( 'Add a new address', 'new' ) return self.select_address.get_html( disabled=disabled ) + address_html -class WorkflowField(BaseField): - def __init__(self, name, user=None, value=None, params=None): +class WorkflowField( BaseField ): + def __init__( self, name, user=None, value=None, params=None ): self.name = name self.user = user self.value = value @@ -580,7 +574,7 @@ class WorkflowField(BaseField): else: self.select_workflow.add_option( a.name, str( a.id ) ) return self.select_workflow.get_html( disabled=disabled ) - + def get_suite(): """Get unittest suite for this module""" import doctest, sys @@ -592,11 +586,11 @@ def build_select_field( trans, objs, lab selected_value='none', refresh_on_change=False, multiple=False, display=None, size=None ): """ Build a SelectField given a set of objects. The received params are: - - objs: the set of object used to populate the option list + - objs: the set of objects used to populate the option list - label_attr: the attribute of each obj (e.g., name, email, etc ) whose value is used to populate each option label. If the string 'self' is passed as label_attr, each obj in objs is assumed to be a string, so the obj itself is used - select_field_name: the name of the SelectField - - initial_value: the vlaue of the first option in the SelectField - allows for an option telling the user to select something + - initial_value: the value of the first option in the SelectField - allows for an option telling the user to select something - selected_value: the value of the currently selected option - refresh_on_change: True if the SelectField should perform a refresh_on_change """ --- a/templates/admin/requests/view_request_type.mako +++ b/templates/admin/requests/view_request_type.mako @@ -38,7 +38,7 @@ <div style="clear: both"></div></div><div class="form-row"> - <label>Sequencing Request form definition</label> + <label>Sequencing request form definition</label> ${request_type.request_form.name} </div><div class="form-row"> --- a/lib/galaxy/model/__init__.py +++ b/lib/galaxy/model/__init__.py @@ -1495,12 +1495,11 @@ class MetadataFile( object ): class FormDefinition( object ): # The following form_builder classes are supported by the FormDefinition class. - # AddressField, CheckboxField, SelectField, TextArea, TextField, WorkflowField supported_field_types = [ AddressField, CheckboxField, SelectField, TextArea, TextField, WorkflowField ] types = Bunch( REQUEST = 'Sequencing Request Form', SAMPLE = 'Sequencing Sample Form', LIBRARY_INFO_TEMPLATE = 'Library information template', - USER_INFO = 'User Information' ) + USER_INFO = 'User Information' ) def __init__( self, name=None, desc=None, fields=[], form_definition_current=None, form_type=None, layout=None ): self.name = name self.desc = desc @@ -1792,6 +1791,8 @@ class RequestTypePermissions( object ): self.role = role class Sample( object ): + # The following form_builder classes are supported by the Sample class. + supported_field_types = [ CheckboxField, SelectField, TextField, WorkflowField ] bulk_operations = Bunch( CHANGE_STATE = 'Change state', SELECT_LIBRARY = 'Select data library and folder' ) api_collection_visible_keys = ( 'id', 'name' ) --- a/lib/galaxy/web/controllers/requests_common.py +++ b/lib/galaxy/web/controllers/requests_common.py @@ -588,12 +588,8 @@ class RequestsCommon( BaseController, Us request = trans.sa_session.query( trans.model.Request ).get( trans.security.decode_id( request_id ) ) except: return invalid_id_redirect( trans, cntrller, request_id ) - events_list = [] - for event in request.events: - events_list.append( ( event.state, time_ago( event.update_time ), event.comment ) ) return trans.fill_template( '/requests/common/view_request_history.mako', cntrller=cntrller, - events_list=events_list, request=request ) @web.expose @web.require_login( "edit email notification settings" ) @@ -777,7 +773,7 @@ class RequestsCommon( BaseController, Us search_box=search_box ) @web.expose @web.require_login( "sample events" ) - def sample_events( self, trans, cntrller, **kwd ): + def view_sample_history( self, trans, cntrller, **kwd ): params = util.Params( kwd ) status = params.get( 'status', 'done' ) message = util.restore_text( params.get( 'message', '' ) ) @@ -786,15 +782,8 @@ class RequestsCommon( BaseController, Us sample = trans.sa_session.query( trans.model.Sample ).get( trans.security.decode_id( sample_id ) ) except: return invalid_id_redirect( trans, cntrller, sample_id ) - events_list = [] - for event in sample.events: - events_list.append( ( event.state.name, - event.state.desc, - time_ago( event.update_time ), - event.comment ) ) - return trans.fill_template( '/requests/common/sample_events.mako', + return trans.fill_template( '/requests/common/view_sample_history.mako', cntrller=cntrller, - events_list=events_list, sample=sample ) @web.expose @web.require_login( "add sample" ) @@ -1054,9 +1043,9 @@ class RequestsCommon( BaseController, Us # selected sets of samples. If samples are selected, the sample_operation param # will have a value other than 'none', and the samples param will be a list of # encoded sample ids. There are currently only 2 multi-select operations; - # 'Change state' and 'Select data library and folder'. If sample_operation is - # 'none, then the samples param will be a list of sample objects. - if sample_operation == 'Change state': + # model.Sample.bulk_operations.CHANGE_STATE and model.sample.bulk_operations.SELECT_LIBRARY. + # If sample_operation is 'none, then the samples param will be a list of sample objects. + if sample_operation == trans.model.Sample.bulk_operations.CHANGE_STATE: sample_state_id = params.get( 'sample_state_id', None ) if sample_state_id in [ None, 'none' ]: message = "Select a new state from the <b>Change current state</b> list before clicking the <b>Save</b> button." @@ -1090,7 +1079,7 @@ class RequestsCommon( BaseController, Us cntrller=cntrller, action='update_request_state', request_id=trans.security.encode_id( request.id ) ) ) - elif sample_operation == 'Select data library and folder': + elif sample_operation == trans.model.sample.bulk_operations.SELECT_LIBRARY: # TODO: fix the code so that the sample_operation_select_field does not use # sample_0_library_id as it's name. it should use something like sample_operation_library_id # and sample_operation_folder_id because the name sample_0_library_id should belong to the --- a/lib/galaxy/web/controllers/forms.py +++ b/lib/galaxy/web/controllers/forms.py @@ -64,12 +64,12 @@ class FormsGrid( grids.Grid ): ] class Forms( BaseController ): - # Empty form field + # Empty TextField empty_field = { 'label': '', 'helptext': '', 'visible': True, 'required': False, - 'type': BaseField.form_field_types()[0], + 'type': model.TextField.__name__, 'selectlist': [], 'layout': 'none', 'default': '' } @@ -597,12 +597,12 @@ class Forms( BaseController ): self.selectbox_options = [] # if the form is for defining samples, then use the sample field types # which does not include TextArea & AddressField - if form_type == trans.app.model.FormDefinition.types.SAMPLE: - for ft in BaseField.sample_field_types(): - self.fieldtype.add_option(ft, ft) + if form_type == trans.model.FormDefinition.types.SAMPLE: + for ft in trans.model.Sample.supported_field_types: + self.fieldtype.add_option( ft.__name__, ft.__name__ ) else: - for ft in BaseField.form_field_types(): - self.fieldtype.add_option(ft, ft) + for ft in trans.model.Request.supported_field_types: + self.fieldtype.add_option( ft.__name__, ft__name__ ) self.required = SelectField('field_required_'+str(index), display='radio') self.required.add_option('Required', 'required') self.required.add_option('Optional', 'optional', selected=True) @@ -632,22 +632,22 @@ class Forms( BaseController ): field[ 'selectlist' ] = ['', ''] # if the form is for defining samples, then use the sample field types # which does not include TextArea & AddressField - if form_type == trans.app.model.FormDefinition.types.SAMPLE: - for ft in BaseField.sample_field_types(): - if ft == field['type']: - self.fieldtype.add_option(ft, ft, selected=True) + if form_type == trans.model.FormDefinition.types.SAMPLE: + for ft in trans.model.Sample.supported_field_types: + if ft.__name__ == field[ 'type' ]: + self.fieldtype.add_option( ft.__name__, ft__name__, selected=True ) if ft == 'SelectField': - self.selectbox_ui(field) + self.selectbox_ui( field ) else: - self.fieldtype.add_option(ft, ft) + self.fieldtype.add_option( ft.__name__, ft.__name__ ) else: - for ft in BaseField.form_field_types(): - if ft == field['type']: - self.fieldtype.add_option(ft, ft, selected=True) + for ft in trans.model.Request.supported_field_types: + if ft.__name__ == field[ 'type' ]: + self.fieldtype.add_option( ft.__name__, ft.__name__, selected=True ) if ft == 'SelectField': - self.selectbox_ui(field) + self.selectbox_ui( field ) else: - self.fieldtype.add_option(ft, ft) + self.fieldtype.add_option( ft.__name__, ft.__name__ ) # required/optional if field['required'] == 'required': self.required = SelectField('field_required_'+str(self.index), display='radio') --- a/templates/admin/requests/create_request_type.mako +++ b/templates/admin/requests/create_request_type.mako @@ -39,7 +39,7 @@ <div style="clear: both"></div></div> %endfor - <div class="toolFormTitle">Possible sample states</div> + <div class="toolFormTitle">Sample states</div> %if len(rt_states_widgets): %for index, info in enumerate(rt_states_widgets): ${render_state( index, info[0], info[1] )} --- a/templates/requests/common/common.mako +++ b/templates/requests/common/common.mako @@ -160,7 +160,7 @@ %if is_unsubmitted: <td>Unsubmitted</td> %else: - <td valign="top"><a href="${h.url_for( controller='requests_common', action='sample_events', cntrller=cntrller, sample_id=trans.security.encode_id( sample.id ) )}">${sample.state.name}</a></td> + <td valign="top"><a href="${h.url_for( controller='requests_common', action='view_sample_history', cntrller=cntrller, sample_id=trans.security.encode_id( sample.id ) )}">${sample.state.name}</a></td> %endif %else: <td></td> @@ -334,7 +334,7 @@ %if is_unsubmitted: <td>Unsubmitted</td> %else: - <td><a id="sampleState-${sample.id}" href="${h.url_for( controller='requests_common', action='sample_events', cntrller=cntrller, sample_id=trans.security.encode_id( sample.id ) )}">${render_sample_state( sample )}</a></td> + <td><a id="sampleState-${sample.id}" href="${h.url_for( controller='requests_common', action='view_sample_history', cntrller=cntrller, sample_id=trans.security.encode_id( sample.id ) )}">${render_sample_state( sample )}</a></td> %endif %if sample_widget_library and library_cntrller is not None: <td><a href="${h.url_for( controller='library_common', action='browse_library', cntrller=library_cntrller, id=trans.security.encode_id( sample_widget_library.id ) )}">${sample_widget_library.name}</a></td> --- a/test/base/twilltestcase.py +++ b/test/base/twilltestcase.py @@ -1536,7 +1536,7 @@ class TwillTestCase( unittest.TestCase ) self.visit_url( "%s/requests_common/view_request_history?cntrller=%s&id=%s" % ( self.url, cntrller, request_id ) ) self.check_page( strings_displayed, strings_displayed_count, strings_not_displayed ) def view_sample_history( self, cntrller, sample_id, strings_displayed=[], strings_displayed_count=[], strings_not_displayed=[] ): - self.visit_url( "%s/requests_common/sample_events?cntrller=%s&sample_id=%s" % ( self.url, cntrller, sample_id ) ) + self.visit_url( "%s/requests_common/view_sample_history?cntrller=%s&sample_id=%s" % ( self.url, cntrller, sample_id ) ) self.check_page( strings_displayed, strings_displayed_count, strings_not_displayed ) def edit_basic_request_info( self, cntrller, request_id, name, new_name='', new_desc='', new_fields=[], strings_displayed=[], strings_displayed_after_submit=[] ): --- a/templates/requests/common/edit_basic_request_info.mako +++ b/templates/requests/common/edit_basic_request_info.mako @@ -8,7 +8,6 @@ is_unsubmitted = request.is_unsubmitted can_add_samples = is_unsubmitted can_reject = is_admin and is_submitted - can_select_datasets = is_admin and ( is_complete or is_submitted ) can_submit_request = request.samples and is_unsubmitted %> @@ -24,9 +23,6 @@ %if can_reject: <a class="action-button" href="${h.url_for( controller='requests_admin', action='reject_request', cntrller=cntrller, id=trans.security.encode_id( request.id ) )}">Reject this request</a> %endif - %if can_select_datasets: - <a class="action-button" href="${h.url_for( controller='requests_admin', action='select_datasets_to_transfer', request_id=trans.security.encode_id( request.id ) )}">Select datasets to transfer</a> - %endif </div></ul> --- /dev/null +++ b/templates/requests/common/view_sample_history.mako @@ -0,0 +1,38 @@ +<%inherit file="/base.mako"/> +<%namespace file="/message.mako" import="render_msg" /> + +<% from galaxy.web.framework.helpers import time_ago %> + +<br/><br/> +<ul class="manage-table-actions"> + <li><a class="action-button" href="${h.url_for( controller='requests_common', action='view_request', cntrller=cntrller, id=trans.security.encode_id( sample.request.id ) )}">Browse this request</a></li> +</ul> + +%if message: + ${render_msg( message, status )} +%endif + +<h3>History of sample "${sample.name}"</h3> + +<div class="toolForm"> + <table class="grid"> + <thead> + <tr> + <th>State</th> + <th>Description</th> + <th>Last Updated</th> + <th>Comments</th> + </tr> + </thead> + <tbody> + %for event in sample.events: + <tr> + <td><b>${event.state.name}</b></td> + <td>${event.state.desc}</td> + <td>${time_ago( event.update_time )}</td> + <td>${event.comment}</td> + </tr> + %endfor + </tbody> + </table> +</div> --- a/lib/galaxy/config.py +++ b/lib/galaxy/config.py @@ -44,8 +44,6 @@ class Configuration( object ): # web API self.enable_api = string_as_bool( kwargs.get( 'enable_api', False ) ) self.enable_openid = string_as_bool( kwargs.get( 'enable_openid', False ) ) - # Communication with a sequencer - self.enable_sequencer_communication = string_as_bool( kwargs.get( 'enable_sequencer_communication', False ) ) # dataset Track files self.track_store_path = kwargs.get( "track_store_path", "${extra_files_path}/tracks") self.tool_path = resolve_path( kwargs.get( "tool_path", "tools" ), self.root ) --- a/templates/requests/common/view_request_history.mako +++ b/templates/requests/common/view_request_history.mako @@ -2,6 +2,8 @@ <%namespace file="/message.mako" import="render_msg" /><% + from galaxy.web.framework.helpers import time_ago + is_admin = cntrller == 'requests_admin' and trans.user_is_admin() is_complete = request.is_complete is_submitted = request.is_submitted @@ -41,16 +43,16 @@ <thead><tr><th>State</th> - <th>Last Update</th> + <th>Last Updated</th><th>Comments</th></tr></thead><tbody> - %for state, updated, comments in events_list: - <tr class="libraryRow libraryOrFolderRow" id="libraryRow"> - <td><b><a>${state}</a></b></td> - <td><a>${updated}</a></td> - <td><a>${comments}</a></td> + %for event in request.events: + <tr> + <td><b>${event.state}</b></td> + <td>${time_ago( event.update_time )}</td> + <td>${event.comment}</td></tr> %endfor </tbody> --- a/templates/requests/common/sample_events.mako +++ /dev/null @@ -1,44 +0,0 @@ -<%inherit file="/base.mako"/> -<%namespace file="/message.mako" import="render_msg" /> - -<%def name="title()">Events for Sample ${sample.name}</%def> - -<h2>Events for Sample "${sample.name}"</h2> -<ul class="manage-table-actions"> - <li><a class="action-button" href="${h.url_for( controller='requests_common', action='view_request', cntrller=cntrller, id=trans.security.encode_id( sample.request.id ) )}">Browse this request</a></li> -</ul> -<h3>Sequencing Request "${sample.request.name}"</h3> - -%if message: - ${render_msg( message, status )} -%endif - -<div class="toolForm"> - <div class="form-row"> - <div class="toolParamHelp" style="clear: both;"> - <b>Possible states: </b> - <% states = " > ".join([ ss.name for ss in sample.request.type.states ]) %> - ${states} - </div> - </div> - <table class="grid"> - <thead> - <tr> - <th>State</th> - <th>Description</th> - <th>Last Update</th> - <th>Comments</th> - </tr> - </thead> - <tbody> - %for state, desc, updated, comments in events_list: - <tr class="libraryRow libraryOrFolderRow" id="libraryRow"> - <td><b><a>${state}</a></b></td> - <td><a>${desc}</a></td> - <td><a>${updated}</a></td> - <td><a>${comments}</a></td> - </tr> - %endfor - </tbody> - </table> -</div>

1 0