-
Notifications
You must be signed in to change notification settings - Fork 80
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 access rights for analyses #181
Merged
Merged
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
d0ab982
Initial commit
ElDeveloper 2d196f6
Merge branch 'master' of https://github.com/biocore/qiita
squirrelo 9435939
initial addition of analysis access conrol
squirrelo f93b97c
fix test to reflect changes
squirrelo 1831d6d
remove set creation. Closes #147
squirrelo 6817cd4
rename check_access to check_analysis_access
squirrelo e1dca81
remove test.txt
squirrelo cf5ffe3
add test for analysis get_public
squirrelo 01a8622
fix SQL call
squirrelo 0b95cbe
remove set creation fir access check
squirrelo File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -149,7 +149,7 @@ def _status_setter_checks(self, conn_handler): | |
|
||
@classmethod | ||
def get_public(cls): | ||
"""Returns study for all public Studies | ||
"""Returns study id for all public Studies | ||
|
||
Returns | ||
------- | ||
|
@@ -160,8 +160,7 @@ def get_public(cls): | |
sql = ("SELECT study_id FROM qiita.{0} WHERE " | ||
"{0}_status_id = %s".format(cls._table)) | ||
# MAGIC NUMBER 2: status id for a public study | ||
return [cls(x[0]) for x in | ||
conn_handler.execute_fetchall(sql, (2,))] | ||
return [x[0] for x in conn_handler.execute_fetchall(sql, (2, ))] | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Same here? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Same as above, just with the Study object. |
||
|
||
@classmethod | ||
def create(cls, owner, title, efo, info, investigation=None): | ||
|
This file contains 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
This file contains 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
This file contains 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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is there a way to currently avoid this?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Currently no, but it is part of the Analysis object so it shouldn't be too big a problem, should it?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OK, just wanted to be sure.