From 70580411337759dcec6a55281c838da7502f1225 Mon Sep 17 00:00:00 2001 From: Greg Von Kuster Date: Tue, 1 Feb 2011 13:11:24 -0500 Subject: [PATCH] Brad Chapman's patch for fixing an issue where the current user roles were not passed to a template. --- lib/galaxy/web/controllers/library.py | 1 + scripts/data_libraries/build_lucene_index.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/galaxy/web/controllers/library.py b/lib/galaxy/web/controllers/library.py index ece87c7df90..419fda59908 100644 --- a/lib/galaxy/web/controllers/library.py +++ b/lib/galaxy/web/controllers/library.py @@ -110,6 +110,7 @@ class Library( BaseController ): search_term=search_term, comptypes=comptypes, lddas=lddas, + current_user_roles=trans.get_current_user_roles(), show_deleted=show_deleted, use_panels=use_panels, message=message, diff --git a/scripts/data_libraries/build_lucene_index.py b/scripts/data_libraries/build_lucene_index.py index 5489c18bf93..dd48613ecb5 100644 --- a/scripts/data_libraries/build_lucene_index.py +++ b/scripts/data_libraries/build_lucene_index.py @@ -61,7 +61,7 @@ def get_lddas( sa_session, max_size, ignore_exts ): fname = "" else: fname = ldda.dataset.get_file_name() - yield ldda.id, fname, _get_dataset_metadata(ldda) + yield ldda.id, fname, _get_dataset_metadata(ldda).replace("\n", " ") def _get_dataset_metadata(ldda): """Retrieve descriptions and information associated with a dataset.