1 new changeset in galaxy-central: http://bitbucket.org/galaxy/galaxy-central/changeset/6da32e46756b/ changeset: 6da32e46756b user: greg date: 2011-06-28 22:19:30 summary: 2 minor bug fixes in the tool shed, and remove unwanted debug statements in an old db migration script. affected #: 2 files (441 bytes) --- a/lib/galaxy/model/migrate/versions/0065_add_name_to_form_fields_and_values.py Tue Jun 28 15:45:56 2011 -0400 +++ b/lib/galaxy/model/migrate/versions/0065_add_name_to_form_fields_and_values.py Tue Jun 28 16:19:30 2011 -0400 @@ -48,24 +48,18 @@ cmd = "SELECT f.id, f.fields FROM form_definition AS f" result = db_session.execute( cmd ) for row in result: - log.debug("Line 51 ROW: %s" % str( row )) form_definition_id = row[0] - log.debug("form_definition_id: %s" % str( form_definition_id )) fields = str( row[1] ) - log.debug("fields: %s" % str( fields )) if not fields.strip(): continue fields_list = from_json_string( fields ) - log.debug("fields_list: %s" % str( fields_list )) if len( fields_list ): for index, field in enumerate( fields_list ): field[ 'name' ] = 'field_%i' % index field[ 'helptext' ] = field[ 'helptext' ].replace("'", "''").replace('"', "") field[ 'label' ] = field[ 'label' ].replace("'", "''") fields_json = to_json_string( fields_list ) - log.debug("fields_json: %s" % str( fields_json )) cmd = "UPDATE form_definition AS f SET f.fields='%s' WHERE f.id=%i" %( fields_json, form_definition_id ) - log.debug("cmd: %s" % str( cmd )) db_session.execute( cmd ) # replace the values list in the content field of the form_values table with a name:value dict cmd = "SELECT form_values.id, form_values.content, form_definition.fields" \ --- a/lib/galaxy/webapps/community/controllers/repository.py Tue Jun 28 15:45:56 2011 -0400 +++ b/lib/galaxy/webapps/community/controllers/repository.py Tue Jun 28 16:19:30 2011 -0400 @@ -261,9 +261,12 @@ category = get_category( trans, category_id ) kwd[ 'f-Category.name' ] = category.name elif operation == "receive email alerts": - return trans.response.send_redirect( web.url_for( controller='repository', - action='set_email_alerts', - **kwd ) ) + if kwd[ 'id' ]: + return trans.response.send_redirect( web.url_for( controller='repository', + action='set_email_alerts', + **kwd ) ) + else: + del kwd[ 'operation' ] # Render the list view return self.repository_list_grid( trans, **kwd ) @web.expose @@ -708,8 +711,8 @@ repository_ids = util.listify( kwd.get( 'id', '' ) ) total_alerts_added = 0 total_alerts_removed = 0 + flush_needed = False for repository_id in repository_ids: - flush_needed = False repository = get_repository( trans, repository_id ) if repository.email_alerts: email_alerts = from_json_string( repository.email_alerts ) 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.