New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[18.01] fix toolbox filters #5526

Merged
merged 3 commits into from Feb 15, 2018

Conversation

Projects
None yet
5 participants
@bgruening
Member

bgruening commented Feb 13, 2018

  • the config variables are called user_tool_*_filters
  • the user-preference labels where not fully populated

@erasche erasche changed the title from fix toolbox filters to [18.01] fix toolbox filters Feb 13, 2018

@galaxybot galaxybot added the triage label Feb 13, 2018

@@ -44,7 +44,7 @@ def build_filters(self, trans, **kwds):
elif name == 'toolbox_label_filters':
category = "label"
if category:
validate = getattr(trans.app.config, 'user_%s_filters' % category, [])
validate = getattr(trans.app.config, 'user_tools_%s_filters' % category, [])

This comment has been minimized.

@jmchilton

jmchilton Feb 14, 2018

Member

Should that be tool instead of tools?

From config.py:

        self.user_tool_filters = listify(kwargs.get("user_tool_filters", []), do_strip=True)
        self.user_tool_label_filters = listify(kwargs.get("user_tool_label_filters", []), do_strip=True)
        self.user_tool_section_filters = listify(kwargs.get("user_tool_section_filters", []), do_strip=True)
        self.has_user_tool_filters = bool(self.user_tool_filters or self.user_tool_label_filters or self.user_tool_section_filters)

This comment has been minimized.

@bgruening

bgruening Feb 14, 2018

Member

jupp :(

jmchilton and others added some commits Feb 14, 2018

@bgruening bgruening added area/UI-UX and removed triage labels Feb 14, 2018

@erasche erasche added this to the 18.01 milestone Feb 14, 2018

@dannon dannon merged commit 6b0e20a into galaxyproject:release_18.01 Feb 15, 2018

4 of 6 checks passed

continuous-integration/travis-ci/pr The Travis CI build failed
Details
selenium test Build finished. 118 tests run, 3 skipped, 1 failed.
Details
api test Build finished. 351 tests run, 5 skipped, 0 failed.
Details
framework test Build finished. 171 tests run, 0 skipped, 0 failed.
Details
integration test Build finished. 79 tests run, 4 skipped, 0 failed.
Details
toolshed test Build finished. 577 tests run, 0 skipped, 0 failed.
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment