Skip to content
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

Fix datalib search pagination #4594

Merged
merged 4 commits into from Sep 14, 2017

Conversation

4 participants
@martenson
Copy link
Member

commented Sep 11, 2017

and remove some cruft code I saw

fixes #2188

@martenson martenson added this to Done in Data Libraries Sep 11, 2017

@galaxybot galaxybot added this to the 17.09 milestone Sep 11, 2017

@martenson martenson force-pushed the martenson:fix-search-pagination branch from e38f7cb to 42defc9 Sep 12, 2017

@martenson

This comment has been minimized.

Copy link
Member Author

commented Sep 12, 2017

rebased, the tests passed previously

@anuprulez

This comment has been minimized.

Copy link
Member

commented Sep 12, 2017

We can remove these three library imports in file (client/galaxy/scripts/mvc/library/library-librarylist-view.js)

 mod_masthead,
 mod_baseMVC,
 mod_utils

although they are unrelated to your changes. I think they are not being used anymore.

martenson added some commits Sep 11, 2017

show the first page of search results
insted of the current selected (would hide short resutls)

@martenson martenson force-pushed the martenson:fix-search-pagination branch from 42defc9 to cdca22b Sep 13, 2017

@martenson

This comment has been minimized.

Copy link
Member Author

commented Sep 13, 2017

@anuprulez I incorporated the request and rebased

@martenson

This comment has been minimized.

Copy link
Member Author

commented Sep 13, 2017

@galaxybot test this

@erasche erasche merged commit cdb95d6 into galaxyproject:dev Sep 14, 2017

6 checks passed

api test Build finished. 292 tests run, 4 skipped, 0 failed.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
framework test Build finished. 161 tests run, 0 skipped, 0 failed.
Details
integration test Build finished. 45 tests run, 0 skipped, 0 failed.
Details
lgtm analysis: JavaScript No alert changes
Details
toolshed test Build finished. 579 tests run, 0 skipped, 0 failed.
Details

@martenson martenson deleted the martenson:fix-search-pagination branch Sep 14, 2017

@martenson martenson moved this from Done to Closed in Data Libraries Sep 14, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.