Merge pull request #1315 from memphis-iis/iss1313

Iss1313: userselect logic
memphis-iis · Nov 14, 2023 · 167bb76 · 167bb76
2 parents 9a632e0 + 2e01f4d
commit 167bb76
Showing 1 changed file with 2 additions and 8 deletions.
diff --git a/mofacts/client/views/new_templates/lessonSelect.js b/mofacts/client/views/new_templates/lessonSelect.js
@@ -218,13 +218,7 @@ Template.lessonSelect.helpers({
             ),
         );
       }
-
-      // Note that we defer checking for userselect in case something above
-      // (e.g. experimentTarget) auto-selects the TDF
-      if (setspec.userselect && !isAdmin) {
-        if (setspec.userselect == 'false') continue;
-      }
-
+
       const audioInputEnabled = setspec.audioInputEnabled ? setspec.audioInputEnabled == 'true' : false;
       const enableAudioPromptAndFeedback = setspec.enableAudioPromptAndFeedback ?
           setspec.enableAudioPromptAndFeedback == 'true' : false;
@@ -293,7 +287,7 @@ Template.lessonSelect.helpers({
       this.tdfTags.set(tdfTags);
 
 
-      if ((tdf.visibility == 'profileOnly' || tdf.visibility == 'enabled') & typeof name != "undefined" & name != "") {
+      if ((tdf.visibility == 'profileOnly' || tdf.visibility == 'enabled') & typeof name != "undefined" & name != "" || setspec.userseleet != 'false') {
         enabledTdfs.push(tdfObject);
       } else {
         disabledTdfs.push(tdfObject);