Commit 75ab3681 authored by John Davis's avatar John Davis
Browse files

Use Role.name 

Fixes bug: the `name` hybrid property has been removed and the field has
been renamed back to `_name`

Ref:
https://github.com/galaxyproject/galaxy/pull/19679/commits/3d2eb9fd8e6281d665ead0e18eb2f3ebde866196
https://github.com/galaxyproject/galaxy/pull/18966/commits/3e6191fbe3b5b1f18c6de2dfd413e9c2a6e34b19
https://github.com/galaxyproject/galaxy/pull/18966/commits/62a8b90f8aab45441b5f6922351b8a5a20cc0848
parent e3e767d2

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,

                        )