From 014cab4c0b44148f2076fd747cb705ff2df07178 Mon Sep 17 00:00:00 2001 From: pritha-tarento Date: Thu, 11 Feb 2021 18:14:11 +0530 Subject: [PATCH 1/7] Added env child_publish_enable flag --- .../ekstep/content/operation/finalizer/ReviewFinalizer.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/platform-modules/content-manager/src/main/java/org/ekstep/content/operation/finalizer/ReviewFinalizer.java b/platform-modules/content-manager/src/main/java/org/ekstep/content/operation/finalizer/ReviewFinalizer.java index 22dc25785a..1bb77b0683 100644 --- a/platform-modules/content-manager/src/main/java/org/ekstep/content/operation/finalizer/ReviewFinalizer.java +++ b/platform-modules/content-manager/src/main/java/org/ekstep/content/operation/finalizer/ReviewFinalizer.java @@ -255,7 +255,8 @@ private void validateResource(String collectionId){ notPublishedList.add(resource.getIdentifier()); } } - if(CollectionUtils.isNotEmpty(notPublishedList)){ + Boolean childPublishEnabled = Platform.config.getBoolean("child_publish_enable"); + if(!childPublishEnabled && CollectionUtils.isNotEmpty(notPublishedList)){ TelemetryManager.error("Collection: " + collectionId + " has unpublished resources:: " + notPublishedList); throw new ClientException("ERR_COLLECTION_WITH_UNPUBLISHED_RESOURCE", "Collection: " + collectionId + " has unpublished resources:: " + notPublishedList); } From 535200eafc7f5e2445db2b989d569262a466e649 Mon Sep 17 00:00:00 2001 From: pritha-tarento Date: Fri, 12 Feb 2021 18:39:53 +0530 Subject: [PATCH 2/7] Modified env var --- .../org/ekstep/content/operation/finalizer/ReviewFinalizer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform-modules/content-manager/src/main/java/org/ekstep/content/operation/finalizer/ReviewFinalizer.java b/platform-modules/content-manager/src/main/java/org/ekstep/content/operation/finalizer/ReviewFinalizer.java index 1bb77b0683..394ace65ea 100644 --- a/platform-modules/content-manager/src/main/java/org/ekstep/content/operation/finalizer/ReviewFinalizer.java +++ b/platform-modules/content-manager/src/main/java/org/ekstep/content/operation/finalizer/ReviewFinalizer.java @@ -255,7 +255,7 @@ private void validateResource(String collectionId){ notPublishedList.add(resource.getIdentifier()); } } - Boolean childPublishEnabled = Platform.config.getBoolean("child_publish_enable"); + Boolean childPublishEnabled = Platform.config.getBoolean("child.publish.enable"); if(!childPublishEnabled && CollectionUtils.isNotEmpty(notPublishedList)){ TelemetryManager.error("Collection: " + collectionId + " has unpublished resources:: " + notPublishedList); throw new ClientException("ERR_COLLECTION_WITH_UNPUBLISHED_RESOURCE", "Collection: " + collectionId + " has unpublished resources:: " + notPublishedList); From c3870644e6e7ab06415ab45f0a526ad4056e6ac8 Mon Sep 17 00:00:00 2001 From: pritha-tarento <42533384+pritha-tarento@users.noreply.github.com> Date: Fri, 12 Feb 2021 18:43:31 +0530 Subject: [PATCH 3/7] Update application.conf.j2 --- ansible/roles/learning-service/templates/application.conf.j2 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ansible/roles/learning-service/templates/application.conf.j2 b/ansible/roles/learning-service/templates/application.conf.j2 index 7aa0a428b6..d5b0490ffa 100644 --- a/ansible/roles/learning-service/templates/application.conf.j2 +++ b/ansible/roles/learning-service/templates/application.conf.j2 @@ -46,6 +46,8 @@ audit.es_conn_info="{{ audit_es_index_host }}" assessment.keyspace.name="{{ content_keyspace_name }}" assessment.keyspace.table="question_data" +child.publish.enable=true + # Actor System Configuration LearningActorSystem { akka { From b01e5ac8bfff6c8c8a43bfd4a67a13a1b3046b46 Mon Sep 17 00:00:00 2001 From: pritha-tarento <42533384+pritha-tarento@users.noreply.github.com> Date: Thu, 25 Feb 2021 13:23:33 +0530 Subject: [PATCH 4/7] Update application.conf.j2 --- ansible/roles/learning-service/templates/application.conf.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/roles/learning-service/templates/application.conf.j2 b/ansible/roles/learning-service/templates/application.conf.j2 index d5b0490ffa..f0f2d741bd 100644 --- a/ansible/roles/learning-service/templates/application.conf.j2 +++ b/ansible/roles/learning-service/templates/application.conf.j2 @@ -46,7 +46,7 @@ audit.es_conn_info="{{ audit_es_index_host }}" assessment.keyspace.name="{{ content_keyspace_name }}" assessment.keyspace.table="question_data" -child.publish.enable=true +collection.only_published_children=true # Actor System Configuration LearningActorSystem { From 1243fbbac9476b5928fe3b760f34a22f5a434644 Mon Sep 17 00:00:00 2001 From: pritha-tarento <42533384+pritha-tarento@users.noreply.github.com> Date: Thu, 25 Feb 2021 13:25:05 +0530 Subject: [PATCH 5/7] Update ReviewFinalizer.java --- .../org/ekstep/content/operation/finalizer/ReviewFinalizer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform-modules/content-manager/src/main/java/org/ekstep/content/operation/finalizer/ReviewFinalizer.java b/platform-modules/content-manager/src/main/java/org/ekstep/content/operation/finalizer/ReviewFinalizer.java index 394ace65ea..af4bede0b2 100644 --- a/platform-modules/content-manager/src/main/java/org/ekstep/content/operation/finalizer/ReviewFinalizer.java +++ b/platform-modules/content-manager/src/main/java/org/ekstep/content/operation/finalizer/ReviewFinalizer.java @@ -255,7 +255,7 @@ private void validateResource(String collectionId){ notPublishedList.add(resource.getIdentifier()); } } - Boolean childPublishEnabled = Platform.config.getBoolean("child.publish.enable"); + Boolean childPublishEnabled = Platform.config.getBoolean("collection.only_published_children"); if(!childPublishEnabled && CollectionUtils.isNotEmpty(notPublishedList)){ TelemetryManager.error("Collection: " + collectionId + " has unpublished resources:: " + notPublishedList); throw new ClientException("ERR_COLLECTION_WITH_UNPUBLISHED_RESOURCE", "Collection: " + collectionId + " has unpublished resources:: " + notPublishedList); From 113ea148c13b5bc3d5ee8d2eeef8d46714a3f6bb Mon Sep 17 00:00:00 2001 From: pritha-tarento <42533384+pritha-tarento@users.noreply.github.com> Date: Fri, 26 Feb 2021 12:47:06 +0530 Subject: [PATCH 6/7] Update ReviewFinalizer.java --- .../ekstep/content/operation/finalizer/ReviewFinalizer.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/platform-modules/content-manager/src/main/java/org/ekstep/content/operation/finalizer/ReviewFinalizer.java b/platform-modules/content-manager/src/main/java/org/ekstep/content/operation/finalizer/ReviewFinalizer.java index af4bede0b2..5e53c864d1 100644 --- a/platform-modules/content-manager/src/main/java/org/ekstep/content/operation/finalizer/ReviewFinalizer.java +++ b/platform-modules/content-manager/src/main/java/org/ekstep/content/operation/finalizer/ReviewFinalizer.java @@ -255,7 +255,8 @@ private void validateResource(String collectionId){ notPublishedList.add(resource.getIdentifier()); } } - Boolean childPublishEnabled = Platform.config.getBoolean("collection.only_published_children"); + Boolean childPublishEnabled = Platform.config.hasPath("collection.only_published_children") ? + Platform.config.getBoolean("collection.only_published_children") : true; if(!childPublishEnabled && CollectionUtils.isNotEmpty(notPublishedList)){ TelemetryManager.error("Collection: " + collectionId + " has unpublished resources:: " + notPublishedList); throw new ClientException("ERR_COLLECTION_WITH_UNPUBLISHED_RESOURCE", "Collection: " + collectionId + " has unpublished resources:: " + notPublishedList); From 069ff351c8ab711003d5fe50053a8622ef40ce17 Mon Sep 17 00:00:00 2001 From: Haritest Date: Thu, 22 Jul 2021 18:24:14 +0530 Subject: [PATCH 7/7] Update application.conf.j2 --- ansible/roles/learning-service/templates/application.conf.j2 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ansible/roles/learning-service/templates/application.conf.j2 b/ansible/roles/learning-service/templates/application.conf.j2 index f0f2d741bd..7948111ef1 100644 --- a/ansible/roles/learning-service/templates/application.conf.j2 +++ b/ansible/roles/learning-service/templates/application.conf.j2 @@ -286,3 +286,5 @@ content.tagging.property="subject,medium" # Search Service Config kp.search_service.base_url="{{ kp_search_service_base_url }}" + +indexHtmlValidation.env=false