Unverified Commit 968ef131 authored by Marius van den Beek's avatar Marius van den Beek Committed by GitHub
Browse files

Merge pull request #20394 from jdavcs/24.2_role_name_bug 

[24.2] Fix searching roles in admin UI
parents e3e767d2 75ab3681

lib/galaxy/webapps/galaxy/controllers/admin.py

+2 −3
Original line number Diff line number Diff line
@@ -191,7 +191,6 @@ class RoleListGrid(grids.GridData): 
    ]



    def apply_query_filter(self, query, **kwargs):

        # Note: we use Role._name (the column), not Role.name (which is a property)

        INDEX_SEARCH_FILTERS = {

            "description": "description",

            "name": "name",
@@ -206,7 +205,7 @@ class RoleListGrid(grids.GridData): 
                    key = term.filter

                    q = term.text

                    if key == "name":

                        query = query.filter(text_column_filter(self.model_class._name, term))

                        query = query.filter(text_column_filter(self.model_class.name, term))

                    if key == "description":

                        query = query.filter(text_column_filter(self.model_class.description, term))

                    elif key == "is":
@@ -217,7 +216,7 @@ class RoleListGrid(grids.GridData): 
                        raw_text_column_filter(

                            [

                                self.model_class.description,

                                self.model_class._name,

                                self.model_class.name,

                            ],

                            term,

                        )