2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/changeset/801e7cf8227f/ changeset: 801e7cf8227f user: dan date: 2012-12-06 22:26:02 summary: Fix for text area formbuilder when None is provided for size. affected #: 1 file diff -r 449f0ed92b4621093d2e1b38dee5894f2a9b959e -r 801e7cf8227fd2b9294a6140d0580b3c78f705fe lib/galaxy/web/form_builder.py --- a/lib/galaxy/web/form_builder.py +++ b/lib/galaxy/web/form_builder.py @@ -67,8 +67,10 @@ >>> print TextArea( "bins", size="4x5", value="default" ).get_html() <textarea name="bins" rows="4" cols="5">default</textarea> """ - def __init__( self, name, size="5x25", value=None ): + _DEFAULT_SIZE = "5x25" + def __init__( self, name, size=None, value=None ): self.name = name + size = size or self._DEFAULT_SIZE self.size = size.split("x") self.rows = int(self.size[0]) self.cols = int(self.size[-1]) https://bitbucket.org/galaxy/galaxy-central/changeset/78a3508c4562/ changeset: 78a3508c4562 user: dan date: 2012-12-06 22:26:02 summary: Fix for error reporting link due to client-side history change (id is now encoded id). affected #: 1 file diff -r 801e7cf8227fd2b9294a6140d0580b3c78f705fe -r 78a3508c456296bd7bd578f5c8dd121d7206fef8 lib/galaxy/webapps/galaxy/controllers/dataset.py --- a/lib/galaxy/webapps/galaxy/controllers/dataset.py +++ b/lib/galaxy/webapps/galaxy/controllers/dataset.py @@ -168,7 +168,12 @@ @web.expose def errors( self, trans, id ): - hda = trans.sa_session.query( model.HistoryDatasetAssociation ).get( id ) + try: + hda = trans.sa_session.query( model.HistoryDatasetAssociation ).get( id ) + except: + hda = None + if not hda: + hda = trans.sa_session.query( model.HistoryDatasetAssociation ).get( trans.security.decode_id( id ) ) if not hda or not self._can_access_dataset( trans, hda ): return trans.show_error_message( "Either this dataset does not exist or you do not have permission to access it." ) return trans.fill_template( "dataset/errors.mako", hda=hda ) 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.