Merge remote-tracking branch 'origin/develop'

TIER · Nov 16, 2022 · b23689b · b23689b
2 parents bdd4a1b + edadb5e
commit b23689b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/EntityDescriptor.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/EntityDescriptor.java
@@ -16,6 +16,7 @@
 
 import javax.annotation.Nullable;
 import javax.persistence.CascadeType;
+import javax.persistence.Column;
 import javax.persistence.ElementCollection;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
@@ -50,6 +51,7 @@ public class EntityDescriptor extends AbstractDescriptor implements org.opensaml
 
     @Getter
     @Setter
+    @Column(columnDefinition = "boolean default true") // this is true for migration reasons, but the java will default false
     private boolean approved;
 
     @OneToOne(cascade = CascadeType.ALL)

diff --git a/...in/java/edu/internet2/tier/shibboleth/admin/ui/repository/EntityDescriptorProjection.java b/...in/java/edu/internet2/tier/shibboleth/admin/ui/repository/EntityDescriptorProjection.java
@@ -40,7 +40,7 @@ public EntityDescriptorProjection(String entityID, String resourceId, String ser
         this.serviceEnabled = serviceEnabled;
         this.idOfOwner = idOfOwner;
         this.protocol = edp == null ? EntityDescriptorProtocol.SAML : edp;
-        this.approved = approved;
+        this.approved = approved || serviceEnabled;
     }
 
     public String getEntityID() {
@@ -54,4 +54,4 @@ public String getEntityId() {
     public EntityDescriptorProtocol getProtocol() {
         return protocol == null ? EntityDescriptorProtocol.SAML : protocol;
     }
-}
+}