Merged
Conversation
will-moore
force-pushed
the
web_api_app
branch
from
e56fd4a to
18c8544
Compare
Member
|
Conflicting PR. Removed from build OMERO-DEV-merge-push#496. See the console output for more details.
|
Member
|
Conflicting PR. Removed from build OMERO-DEV-merge-push#497. See the console output for more details.
|
will-moore
added a commit
to will-moore/openmicroscopy
that referenced
this pull request
Nov 4, 2016
chris-allan
requested changes
Nov 7, 2016
| @@ -0,0 +1,2 @@ | |||
|
|
|||
| ScreenPlateLinkI, AnnotationAnnotationLinkI, TagAnnotationI | ||
| from omero import ApiUsageException, ServerError, CmdError | ||
| from omero.rtypes import rlong, rlist | ||
| from omeroweb.api.views import LoginView |
Member
There was a problem hiding this comment.
The base class should be left in the webgateway. Having interdependence between the api and webclient application seems like a bad idea. Especially if we decide to move the api application into its own repository.
Member
|
As a matter of discussion, in addition to the above review, I don't personally like the camel case decorator class names but I'm not vehemently opposed to them. /cc @aleksandra-tarkowska, @knabar, @waxenegger |
will-moore
force-pushed
the
web_api_app
branch
from
52f0b28 to
0eb6967
Compare
chris-allan
approved these changes
Nov 10, 2016
Member
|
Ready to merge. |
Member
|
Thanks @chris-allan |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What this PR does
Moves the new
/api/urls and functionality from #4708 to a newapiapp.All the tests in
OmeroWeb/test/integration/test_api_login.py,test_api_projects.pyandtest_api_errors.pyremain unchanged and should still be green.Most changes are to fix pep8 warnings (since I now have them "ON" by default in SublimeText 3) including LoginRequired and JsonResponseHandler for class-based decorator names. I could revert these if preferred.