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

Separate admin controllers #4327

Merged
merged 13 commits into from Jul 31, 2017

Conversation

Projects
None yet
3 participants
@guerler
Copy link
Contributor

commented Jul 20, 2017

This PR separates the admin controllers of the Toolshed and Galaxy. Although this creates some temporary redundancy, this avoids conflicts when we move forward and modernize the Galaxy web app by removing makos and moving/redirecting endpoint operations to the Galaxy api.

@guerler guerler added this to the 17.09 milestone Jul 20, 2017

@guerler guerler added status/review and removed status/WIP labels Jul 21, 2017

@guerler guerler requested a review from jmchilton Jul 24, 2017

@guerler guerler requested review from martenson and removed request for jmchilton Jul 28, 2017

@@ -145,3 +144,11 @@ def undelete( self, trans, id, **kwd ):
return self._undelete_quota( quota )
except ActionInputError as e:
raise HTTPBadRequest( detail=str( e ) )


def get_quota( trans, id ):

This comment has been minimized.

Copy link
@jmchilton

jmchilton Jul 28, 2017

Member

I'm probably missing something but I'm a bit confused by this - where does this get called? All the calls to get_quota seem to be on objects not from modules like this.

This comment has been minimized.

Copy link
@guerler

guerler Jul 28, 2017

Author Contributor

Awesome. Thanks for catching this. I assumed that this is called due to the previous inheritance of the shared admin controller. I removed the method.

@jmchilton

This comment has been minimized.

Copy link
Member

commented Jul 28, 2017

This is very nice - I like this separation a lot - really nice direction to refactor things in. Much needed!

@martenson
Copy link
Member

left a comment

smooth refactoring

@martenson martenson merged commit 2659718 into galaxyproject:dev Jul 31, 2017

5 checks passed

api test Build finished. 279 tests run, 0 skipped, 0 failed.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
framework test Build finished. 150 tests run, 0 skipped, 0 failed.
Details
integration test Build finished. 37 tests run, 0 skipped, 0 failed.
Details
toolshed test Build finished. 579 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
You can’t perform that action at this time.