Skip to content

Merge from remote #2

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.

Sign up for GitHub

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

Open
jfnavarro wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Merge from remote #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9dd240a
Merge pull request #1 from jfnavarro/master
jfnavarro Aug 4, 2016
594a768
Fixed a small bug that would case admin user to not be able to access…
jfnavarro Sep 13, 2016
180f777
Fixed a small bug that would case admin user to not be able to access…
jfnavarro Sep 13, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<groupId>spatialtranscriptomicsresearch</groupId>
<artifactId>api</artifactId>
<packaging>war</packaging>
<version>0.6.4</version>
<version>0.6.5</version>
<name>Spatial Transcriptomics Research API Server</name>
<url>http://maven.apache.org</url>

Expand Down
3 changes: 2 additions & 1 deletion src/main/java/com/st/serviceImpl/FeaturesServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,8 @@ public FeaturesMetadata getMetadata(String id) {
@Override
public InputStream find(String id) {
MongoUserDetails currentUser = customUserDetailsService.loadCurrentUser();
if (currentUser.isContentManager() || datasetIsGranted(id, currentUser)) {
// Check access
if (currentUser.isAdmin()|| datasetIsGranted(id, currentUser)) {
try {
String filename = id + ".gz";
// We cache the contents in a byte array so that the S3 stream can be closed ASAP.
Expand Down