2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/7a027f285f3b/ Changeset: 7a027f285f3b Branch: next-stable User: davebgx Date: 2014-12-12 16:45:48+00:00 Summary: Merge stable. Affected #: 2 files diff -r daa0c69e837855af94d2255999e732f1fec87550 -r 7a027f285f3b441f8ff1fe48dfc5841d8bc41bfa .hgtags --- a/.hgtags +++ b/.hgtags @@ -20,4 +20,4 @@ ca45b78adb4152fc6e7395514d46eba6b7d0b838 release_2014.08.11 548ab24667d6206780237bd807f7d857a484c461 latest_2014.08.11 2092948937ac30ef82f71463a235c66d34987088 release_2014.10.06 -212e1d5e9be5a9a1e12c834bd545de504753c9fe latest_2014.10.06 +e416697be38e66f18be89a4cfca70457c9784294 latest_2014.10.06 diff -r daa0c69e837855af94d2255999e732f1fec87550 -r 7a027f285f3b441f8ff1fe48dfc5841d8bc41bfa lib/galaxy/webapps/galaxy/controllers/library_admin.py --- a/lib/galaxy/webapps/galaxy/controllers/library_admin.py +++ b/lib/galaxy/webapps/galaxy/controllers/library_admin.py @@ -162,12 +162,12 @@ library.root_folder = root_folder trans.sa_session.add_all( ( library, root_folder ) ) trans.sa_session.flush() - message = "The new library named '%s' has been created" + message = "The new library named '%s' has been created" % library.name return trans.response.send_redirect( web.url_for( controller='library_common', action='browse_library', cntrller='library_admin', id=trans.security.encode_id( library.id ), - message=escape( message ), + message=message, status='done' ) ) return trans.fill_template( '/admin/library/new_library.mako', message=escape( message ), status=escape( status ) ) @web.expose https://bitbucket.org/galaxy/galaxy-central/commits/efd0286e7629/ Changeset: efd0286e7629 User: davebgx Date: 2014-12-12 16:46:09+00:00 Summary: Merge next-stable. Affected #: 2 files diff -r 78354a5f3dfaaec619979cda46892abcd5722e9a -r efd0286e7629289c4c583898ebecb32646834c64 .hgtags --- a/.hgtags +++ b/.hgtags @@ -20,4 +20,4 @@ ca45b78adb4152fc6e7395514d46eba6b7d0b838 release_2014.08.11 548ab24667d6206780237bd807f7d857a484c461 latest_2014.08.11 2092948937ac30ef82f71463a235c66d34987088 release_2014.10.06 -212e1d5e9be5a9a1e12c834bd545de504753c9fe latest_2014.10.06 +e416697be38e66f18be89a4cfca70457c9784294 latest_2014.10.06 diff -r 78354a5f3dfaaec619979cda46892abcd5722e9a -r efd0286e7629289c4c583898ebecb32646834c64 lib/galaxy/webapps/galaxy/controllers/library_admin.py --- a/lib/galaxy/webapps/galaxy/controllers/library_admin.py +++ b/lib/galaxy/webapps/galaxy/controllers/library_admin.py @@ -162,12 +162,12 @@ library.root_folder = root_folder trans.sa_session.add_all( ( library, root_folder ) ) trans.sa_session.flush() - message = "The new library named '%s' has been created" + message = "The new library named '%s' has been created" % library.name return trans.response.send_redirect( web.url_for( controller='library_common', action='browse_library', cntrller='library_admin', id=trans.security.encode_id( library.id ), - message=escape( message ), + message=message, status='done' ) ) return trans.fill_template( '/admin/library/new_library.mako', message=escape( message ), status=escape( status ) ) @web.expose 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.