AtlasOfLivingAustralia/profile-hub#717 keepImagePrivate by default tu…

…rned on
AtlasOfLivingAustralia · Jul 7, 2021 · 0487345 · 0487345
1 parent 585328f
commit 0487345
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 11 deletions.
diff --git a/grails-app/domain/au/org/ala/profile/Opus.groovy b/grails-app/domain/au/org/ala/profile/Opus.groovy
@@ -67,7 +67,7 @@ class Opus {
     List<SupportingOpus> sharingDataWith = []
     List<Attachment> attachments = []
     boolean autoApproveShareRequests = true
-    boolean keepImagesPrivate = false
+    boolean keepImagesPrivate = true
     boolean usePrivateRecordData = false
     ImageOption approvedImageOption = ImageOption.INCLUDE
 

diff --git a/src/integration-test/groovy/au/org/ala/profile/SearchServiceSpec.groovy b/src/integration-test/groovy/au/org/ala/profile/SearchServiceSpec.groovy
@@ -83,13 +83,8 @@ class SearchServiceSpec extends BaseIntegrationSpec {
     def "findByScientificName should exclude matches from private collections when there is no logged in user"() {
         given:
         Opus opus1 = save new Opus(glossary: new Glossary(), dataResourceUid: "dr1", title: "title1")
-<<<<<<< HEAD:test/integration/au/org/ala/profile/SearchServiceSpec.groovy
-        Opus opus2 = save new Opus(glossary: new Glossary(), dataResourceUid: "dr2", title: "title2", privateCollection: true, authorities: [[uuid: "1", user: [userId: "9876", name: "user 1"], role: "ROLE_USER"]])
-        Opus opus3 = save new Opus(glossary: new Glossary(), dataResourceUid: "dr3", title: "title3", privateCollection: true, authorities: [[uuid: "2", user: [userId: "1234", name: "user 2"], role: "ROLE_USER"]])
-=======
         Opus opus2 = save new Opus(glossary: new Glossary(), dataResourceUid: "dr2", title: "title2", privateCollection: true, authorities: [[uuid: "1", user: [userId: "9876", name: "name 1"], role: "ROLE_USER"]])
         Opus opus3 = save new Opus(glossary: new Glossary(), dataResourceUid: "dr3", title: "title3", privateCollection: true, authorities: [[uuid: "2", user: [userId: "1234", name: "name 2"], role: "ROLE_USER"]])
->>>>>>> dev:src/integration-test/groovy/au/org/ala/profile/SearchServiceSpec.groovy
 
         Profile profile1 = save new Profile(scientificName: "name1", fullName: "name1", opus: opus1, rank: "kingdom", classification: [new Classification(rank: "kingdom", name: "Plantae")])
         Profile profile2 = save new Profile(scientificName: "name2", fullName: "name2", opus: opus2, rank: "kingdom", classification: [new Classification(rank: "kingdom", name: "Plantae")])
@@ -111,13 +106,8 @@ class SearchServiceSpec extends BaseIntegrationSpec {
     def "findByScientificName should include matches from private collections when the logged in user is registered with that collection"() {
         given:
         Opus opus1 = save new Opus(glossary: new Glossary(), dataResourceUid: "dr1", title: "title1")
-<<<<<<< HEAD:test/integration/au/org/ala/profile/SearchServiceSpec.groovy
-        Opus opus2 = save new Opus(glossary: new Glossary(), dataResourceUid: "dr2", title: "title2", privateCollection: true, authorities: [[uuid: "1", user: [userId: "9876", name: "user 1"], role: "ROLE_USER"]])
-        Opus opus3 = save new Opus(glossary: new Glossary(), dataResourceUid: "dr3", title: "title3", privateCollection: true, authorities: [[uuid: "2", user: [userId: "1234", name: "user 1"], role: "ROLE_USER"]])
-=======
         Opus opus2 = save new Opus(glossary: new Glossary(), dataResourceUid: "dr2", title: "title2", privateCollection: true, authorities: [[uuid: "1", user: [userId: "9876", name: "name 1"], role: "ROLE_USER"]])
         Opus opus3 = save new Opus(glossary: new Glossary(), dataResourceUid: "dr3", title: "title3", privateCollection: true, authorities: [[uuid: "2", user: [userId: "1234", name: "name 2"], role: "ROLE_USER"]])
->>>>>>> dev:src/integration-test/groovy/au/org/ala/profile/SearchServiceSpec.groovy
 
         Profile profile1 = save new Profile(scientificName: "name1", fullName: "name1", opus: opus1, rank: "kingdom", classification: [new Classification(rank: "kingdom", name: "Plantae")])
         Profile profile2 = save new Profile(scientificName: "name2", fullName: "name2", opus: opus2, rank: "kingdom", classification: [new Classification(rank: "kingdom", name: "Plantae")])