Read defaultGlobalReadPermissions directly, not inverted.

OHDSI · Aug 29, 2023 · fe070e5 · fe070e5
1 parent 4ef8c8a
commit fe070e5
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/src/main/java/org/ohdsi/webapi/cohortcharacterization/CcServiceImpl.java b/src/main/java/org/ohdsi/webapi/cohortcharacterization/CcServiceImpl.java
@@ -213,7 +213,7 @@ public class CcServiceImpl extends AbstractDaoService implements CcService, Gene
 
     private PermissionService permissionService;
 
-    @Value("#{'${security.defaultGlobalReadPermissions}'.equals(false)}")
+    @Value("${security.defaultGlobalReadPermissions}")
     private boolean defaultGlobalReadPermissions;
 
     private final Environment env;

diff --git a/src/main/java/org/ohdsi/webapi/estimation/EstimationController.java b/src/main/java/org/ohdsi/webapi/estimation/EstimationController.java
@@ -72,7 +72,7 @@ public class EstimationController {
   private EstimationChecker checker;
   private PermissionService permissionService;
 
-  @Value("#{'${security.defaultGlobalReadPermissions}'.equals(false)}")
+  @Value("${security.defaultGlobalReadPermissions}")
   private boolean defaultGlobalReadPermissions;
 
   public EstimationController(EstimationService service,

diff --git a/src/main/java/org/ohdsi/webapi/pathway/PathwayServiceImpl.java b/src/main/java/org/ohdsi/webapi/pathway/PathwayServiceImpl.java
@@ -122,7 +122,7 @@ public class PathwayServiceImpl extends AbstractDaoService implements PathwaySer
 
 	private PermissionService permissionService;
 
-	@Value("#{'${security.defaultGlobalReadPermissions}'.equals(false)}")
+	@Value("${security.defaultGlobalReadPermissions}")
 	private boolean defaultGlobalReadPermissions;
 
 	private final List<String> STEP_COLUMNS = Arrays.asList(new String[]{"step_1", "step_2", "step_3", "step_4", "step_5", "step_6", "step_7", "step_8", "step_9", "step_10"});

diff --git a/src/main/java/org/ohdsi/webapi/prediction/PredictionController.java b/src/main/java/org/ohdsi/webapi/prediction/PredictionController.java
@@ -68,7 +68,7 @@ public class PredictionController {
 
   private PermissionService permissionService;
 
-  @Value("#{'${security.defaultGlobalReadPermissions}'.equals(false)}")
+  @Value("${security.defaultGlobalReadPermissions}")
   private boolean defaultGlobalReadPermissions;
 
   @Autowired

diff --git a/src/main/java/org/ohdsi/webapi/service/CohortDefinitionService.java b/src/main/java/org/ohdsi/webapi/service/CohortDefinitionService.java
@@ -205,7 +205,7 @@ public class CohortDefinitionService extends AbstractDaoService implements HasTa
 	@Autowired
 	private VersionService<CohortVersion> versionService;
 
-        @Value("#{'${security.defaultGlobalReadPermissions}'.equals(false)}")
+        @Value("${security.defaultGlobalReadPermissions}")
 	private boolean defaultGlobalReadPermissions;
 
 	private final MarkdownRender markdownPF = new MarkdownRender();

diff --git a/src/main/java/org/ohdsi/webapi/service/ConceptSetService.java b/src/main/java/org/ohdsi/webapi/service/ConceptSetService.java
@@ -104,7 +104,7 @@ public class ConceptSetService extends AbstractDaoService implements HasTags<Int
     @Autowired
     private VersionService<ConceptSetVersion> versionService;
 
-    @Value("#{'${security.defaultGlobalReadPermissions}'.equals(false)}")
+    @Value("${security.defaultGlobalReadPermissions}")
     private boolean defaultGlobalReadPermissions;
 
     public static final String COPY_NAME = "copyName";

diff --git a/src/main/java/org/ohdsi/webapi/service/IRAnalysisService.java b/src/main/java/org/ohdsi/webapi/service/IRAnalysisService.java
@@ -142,7 +142,7 @@ public class IRAnalysisService extends AbstractDaoService implements
 
   private final IRAnalysisQueryBuilder queryBuilder;
 
-  @Value("#{'${security.defaultGlobalReadPermissions}'.equals(false)}")
+  @Value("${security.defaultGlobalReadPermissions}")
   private boolean defaultGlobalReadPermissions;
 
   @Autowired