Merge branch 'release-45.1.0'

oat-sa · Jan 10, 2023 · f6f087e · f6f087e
2 parents fbae1b6 + ac94edd
commit f6f087e
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 6 deletions.
diff --git a/views/js/controller/creator/templates/section-props.tpl b/views/js/controller/creator/templates/section-props.tpl
@@ -187,6 +187,7 @@
             </div>
         </div>
 
+        {{#if hasSelectionWithReplacement}}
 <!-- assessmentTest/testPart/assessmentSection/selection/withReplacement -->
         <div class="grid-row pseudo-label-box">
             <div class="col-5">
@@ -206,6 +207,7 @@
                 </div>
             </div>
         </div>
+        {{/if}}
     </div>
 
     <h4 class="toggler closed" data-toggle="~ .section-ordering">{{__ 'Ordering'}}</h4>

diff --git a/views/js/controller/creator/views/section.js b/views/js/controller/creator/views/section.js
@@ -38,7 +38,8 @@ define([
     'ui/dialog/confirm',
     'taoQtiTest/controller/creator/helpers/subsection',
     'taoQtiTest/controller/creator/helpers/validators',
-    'taoQtiTest/controller/creator/helpers/featureVisibility'
+    'taoQtiTest/controller/creator/helpers/featureVisibility',
+    'services/features'
 ], function (
     $,
     _,
@@ -58,7 +59,8 @@ define([
     confirmDialog,
     subsectionsHelper,
     validators,
-    featureVisibility
+    featureVisibility,
+    servicesFeatures
 ) {
     ('use strict');
 
@@ -94,6 +96,11 @@ define([
             sectionModel.hasBlueprint = true;
         }
 
+        sectionModel.hasSelectionWithReplacement = servicesFeatures.isVisible(
+            'taoQtiTest/creator/properties/selectionWithReplacement',
+            false
+        );
+
         //add feature visibility properties to sectionModel
         featureVisibility.addSectionVisibilityProps(sectionModel);
 

diff --git a/views/js/controller/creator/views/subsection.js b/views/js/controller/creator/views/subsection.js
@@ -32,7 +32,8 @@ define([
     'taoQtiTest/controller/creator/helpers/sectionBlueprints',
     'ui/dialog/confirm',
     'taoQtiTest/controller/creator/helpers/subsection',
-    'taoQtiTest/controller/creator/helpers/validators'
+    'taoQtiTest/controller/creator/helpers/validators',
+    'services/features'
 ], function (
     $,
     _,
@@ -49,7 +50,8 @@ define([
     sectionBlueprint,
     confirmDialog,
     subsectionsHelper,
-    validators
+    validators,
+    servicesFeatures
 ) {
     'use strict';
     /**
@@ -81,6 +83,12 @@ define([
         if (!_.isEmpty(config.routes.blueprintsById)) {
             subsectionModel.hasBlueprint = true;
         }
+
+        sectionModel.hasSelectionWithReplacement = servicesFeatures.isVisible(
+            'taoQtiTest/creator/properties/selectionWithReplacement',
+            false
+        );
+
         actions.properties($titleWithActions, 'section', subsectionModel, propHandler);
         actions.move($titleWithActions, 'subsections', 'subsection');
         actions.displayItemWrapper($subsection);

diff --git a/views/js/loader/taoQtiTest.min.js b/views/js/loader/taoQtiTest.min.js
diff --git a/views/js/loader/taoQtiTest.min.js.map b/views/js/loader/taoQtiTest.min.js.map