SAK-41239 T&Qs Question pools are shown duplicated on select (sakaipr…

…oject#6902)
brdebr · May 14, 2019 · 264e717 · 264e717
1 parent 8a96042
commit 264e717
Show file tree

Hide file tree

Showing 16 changed files with 2 additions and 15 deletions.
diff --git a/...-app/bin/src/java/org/sakaiproject/tool/assessment/bundle/AuthorMessages_fa_IR.properties b/...-app/bin/src/java/org/sakaiproject/tool/assessment/bundle/AuthorMessages_fa_IR.properties
@@ -398,7 +398,6 @@ select_menu=\u0627\u0646\u062a\u062e\u0627\u0628 \u06a9\u0631\u062f\u0646
 select_appropriate_format=\u0641\u0631\u0645\u062a \u0645\u0646\u0627\u0633\u0628 \u0631\u0627 \u0627\u0646\u062a\u062e\u0627\u0628 \u06a9\u0646\u06cc\u062f
 options_text=\u06af\u0632\u06cc\u0646\u0647\u200e\u0647\u0627
 select_a_pool_name=\u06cc\u06a9 \u0646\u0627\u0645 \u0645\u062e\u0632\u0646 \u0631\u0627 \u0627\u0646\u062a\u062e\u0627\u0628 \u06a9\u0646\u06cc\u062f (\u0627\u062e\u062a\u06cc\u0627\u0631\u06cc)
-select_a_pool_for_random_draw=\u0627\u0646\u062a\u062e\u0627\u0628 \u06cc\u06a9 \u0645\u062e\u0632\u0646 \u0633\u0648\u0627\u0644
 select_num_questions=(\#\#\#)
 select_combo=\u0627\u0646\u062a\u062e\u0627\u0628 \u06a9\u0631\u062f\u0646
 select_one=\u06cc\u06a9\u06cc \u0631\u0627 \u0627\u0646\u062a\u062e\u0627\u0628 \u06a9\u0646 ...

diff --git a/samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/AuthorMessages.properties b/samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/AuthorMessages.properties
@@ -418,7 +418,6 @@ select_menu=select
 select_appropriate_format=Select the appropriate format
 options_text=Options
 select_a_pool_name=Select a pool name (optional)
-select_a_pool_for_random_draw=Select a question pool
 select_num_questions=(###)
 select_combo=select
 select_one=select one ...

diff --git a/.../samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/AuthorMessages_ca.properties b/.../samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/AuthorMessages_ca.properties
@@ -413,7 +413,6 @@ select_menu=selecciona
 select_appropriate_format=Seleccioneu el format apropiat
 options_text=Opcions
 select_a_pool_name=Seleccioneu un nom de fons (opcional)
-select_a_pool_for_random_draw=Seleccioneu un fons de preguntes
 select_num_questions=(\#\#\#)
 select_combo=seleccioneu
 select_one=seleccioneu-ne un ...

diff --git a/.../samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/AuthorMessages_es.properties b/.../samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/AuthorMessages_es.properties
@@ -413,7 +413,6 @@ select_menu=seleccionar
 select_appropriate_format=Seleccione el formato adecuado
 options_text=Opciones
 select_a_pool_name=Seleccione un nombre para la bater\u00eda (opcional)
-select_a_pool_for_random_draw=Seleccione el nombre de la bater\u00eda
 select_num_questions=(\#\#\#)
 select_combo=selecccione
 select_one=seleccione una ...

diff --git a/.../samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/AuthorMessages_eu.properties b/.../samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/AuthorMessages_eu.properties
@@ -413,7 +413,6 @@ select_menu=aukeratu
 select_appropriate_format=Formatu egokia hautatu
 options_text=Aukerak
 select_a_pool_name=Aukeratu biltzailea
-select_a_pool_for_random_draw=Aukeratu galderen biltzaile bat
 select_num_questions=(\#\#\#)
 select_combo=aukeratu
 select_one=aukeratu bat ...

diff --git a/...migo-app/src/java/org/sakaiproject/tool/assessment/bundle/AuthorMessages_fa_IR.properties b/...migo-app/src/java/org/sakaiproject/tool/assessment/bundle/AuthorMessages_fa_IR.properties
@@ -398,7 +398,6 @@ select_menu=\u0627\u0646\u062a\u062e\u0627\u0628 \u06a9\u0631\u062f\u0646
 select_appropriate_format=\u0641\u0631\u0645\u062a \u0645\u0646\u0627\u0633\u0628 \u0631\u0627 \u0627\u0646\u062a\u062e\u0627\u0628 \u06a9\u0646\u06cc\u062f
 options_text=\u06af\u0632\u06cc\u0646\u0647 \u0647\u0627
 select_a_pool_name=\u06cc\u06a9 \u0646\u0627\u0645 \u0645\u062e\u0632\u0646 \u0631\u0627 \u0627\u0646\u062a\u062e\u0627\u0628 \u06a9\u0646\u06cc\u062f (\u0627\u062e\u062a\u06cc\u0627\u0631\u06cc)
-select_a_pool_for_random_draw=\u0627\u0646\u062a\u062e\u0627\u0628 \u06cc\u06a9 \u0645\u062e\u0632\u0646 \u0633\u0648\u0627\u0644
 select_num_questions=(\#\#\#)
 select_combo=\u0627\u0646\u062a\u062e\u0627\u0628 \u06a9\u0631\u062f\u0646
 select_one=\u06cc\u06a9\u06cc \u0631\u0627 \u0627\u0646\u062a\u062e\u0627\u0628 \u06a9\u0646 ...

diff --git a/...migo-app/src/java/org/sakaiproject/tool/assessment/bundle/AuthorMessages_fr_FR.properties b/...migo-app/src/java/org/sakaiproject/tool/assessment/bundle/AuthorMessages_fr_FR.properties
@@ -348,7 +348,6 @@ select_menu=s\u00e9lectionner
 select_appropriate_format=S\u00e9lectionnez le format appropri\u00e9
 options_text=Options
 select_a_pool_name=S\u00e9lectionnez un nom de r\u00e9serve (optionnel)
-select_a_pool_for_random_draw=S\u00e9lectionnez une r\u00e9serve de questions
 select_num_questions=(\#\#\#)
 select_combo=s\u00e9lectionner
 select_one=s\u00e9lectionnez une ...

diff --git a/...migo-app/src/java/org/sakaiproject/tool/assessment/bundle/AuthorMessages_hi_IN.properties b/...migo-app/src/java/org/sakaiproject/tool/assessment/bundle/AuthorMessages_hi_IN.properties
@@ -348,7 +348,6 @@ select_menu=\u091a\u092f\u0928 \u0915\u0930\u0947\u0902
 select_appropriate_format=\u0909\u091a\u093f\u0924 \u092a\u094d\u0930\u093e\u0930\u0942\u092a \u0915\u093e \u091a\u092f\u0928 \u0915\u0930\u0947\u0902
 options_text=\u0935\u093f\u0915\u0932\u094d\u092a
 select_a_pool_name=\u090f\u0915 \u092a\u0942\u0932 \u0928\u093e\u092e (\u0935\u0948\u0915\u0932\u094d\u092a\u093f\u0915) \u0915\u093e \u091a\u092f\u0928 \u0915\u0930\u0947\u0902
-select_a_pool_for_random_draw=\u090f\u0915 \u092a\u094d\u0930\u0936\u094d\u0928 \u092a\u0942\u0932 \u0915\u093e \u091a\u092f\u0928 \u0915\u0930\u0947\u0902
 select_num_questions=(\#\#\#)
 select_combo=\u091a\u092f\u0928 \u0915\u0930\u0947\u0902
 select_one=\u090f\u0915 \u0915\u093e \u091a\u092f\u0928 \u0915\u0930\u0947\u0902...

diff --git a/.../samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/AuthorMessages_ja.properties b/.../samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/AuthorMessages_ja.properties
@@ -404,7 +404,6 @@ select_menu=\u9078\u629e
 select_appropriate_format=\u9069\u5207\u306a\u30d5\u30a9\u30fc\u30de\u30c3\u30c8\u3092\u9078\u629e
 options_text=\u30aa\u30d7\u30b7\u30e7\u30f3
 select_a_pool_name=\u30d7\u30fc\u30eb\u540d\u3092\u9078\u629e\u3057\u307e\u3059 (\u30aa\u30d7\u30b7\u30e7\u30f3)
-select_a_pool_for_random_draw=\u554f\u984c\u30d7\u30fc\u30eb\u3092\u9078\u629e\u3057\u307e\u3059
 select_num_questions=(\#\#\#)
 select_combo=\u9078\u629e
 select_one=\u4e00\u3064\u9078\u629e\u3057\u307e\u3059 ...

diff --git a/.../samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/AuthorMessages_mn.properties b/.../samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/AuthorMessages_mn.properties
@@ -332,7 +332,6 @@ secondary_pass= \u0425\u043E\u0451\u0440\u0434\u043E\u0433\u0447 ID \u0431\u0430
 select=[\u0421\u043E\u043D\u0433\u043E\u0445]
 select_menu=\u0441\u043E\u043D\u0433\u043E\u0445
 select_a_pool_name=\u0421\u0430\u043D\u0433\u0438\u0439\u043D \u043D\u044D\u0440\u0438\u0439\u0433 \u0441\u043E\u043D\u0433\u043E\u0445 (\u0434\u0443\u0440\u044B\u043D \u0441\u043E\u043D\u0433\u043E\u043B\u0442) 
-select_a_pool_for_random_draw= \u0410\u0441\u0443\u0443\u043B\u0442\u044B\u043D \u043D\u04E9\u04E9\u0446 \u0441\u043E\u043D\u0433\u043E\u0445 
 select_num_questions=(###)
 select_combo=\u0441\u043E\u043D\u0433\u043E\u0445
 select_one=\u043D\u044D\u0433\u0438\u0439\u0433 \u0441\u043E\u043D\u0433\u043E\u0445 ...

diff --git a/...migo-app/src/java/org/sakaiproject/tool/assessment/bundle/AuthorMessages_pt_BR.properties b/...migo-app/src/java/org/sakaiproject/tool/assessment/bundle/AuthorMessages_pt_BR.properties
@@ -369,7 +369,6 @@ select_menu=selecionar
 select_appropriate_format=Selecione o formato apropriado
 options_text=Op\u00e7\u00f5es
 select_a_pool_name=Selecione um nome para o banco (opcional)
-select_a_pool_for_random_draw=Selecione uma quest\u00e3o do banco
 select_num_questions=(###)
 select_combo=selecionar
 select_one=selecionar um...

diff --git a/.../samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/AuthorMessages_sv.properties b/.../samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/AuthorMessages_sv.properties
@@ -324,7 +324,6 @@ scale10=1 -> 10
 scale5=1 -> 5
 secondary_pass=Sekond\u00E4rt ID och l\u00F6senord 
 select=[V\u00E4lj]
-select_a_pool_for_random_draw=V\u00E4lj en fr\u00E5gebank
 select_a_pool_name=V\u00E4lj en fr\u00E5gebank (valfritt)
 select_combo=v\u00E4lj
 select_menu=v\u00E4lj

diff --git a/...migo-app/src/java/org/sakaiproject/tool/assessment/bundle/AuthorMessages_tr_TR.properties b/...migo-app/src/java/org/sakaiproject/tool/assessment/bundle/AuthorMessages_tr_TR.properties
@@ -405,7 +405,6 @@ select_menu=se\u00e7in
 select_appropriate_format=Uygun bi\u00e7imi se\u00e7in
 options_text=Se\u00e7enekler
 select_a_pool_name=Bir havuz ad\u0131 se\u00e7in (iste\u011fe ba\u011fl\u0131)
-select_a_pool_for_random_draw=Bir soru havuzu se\u00e7in
 select_num_questions=(\#\#\#)
 select_combo=se\u00e7in
 select_one=--birini se\u00e7--

diff --git a/...migo-app/src/java/org/sakaiproject/tool/assessment/bundle/AuthorMessages_zh_CN.properties b/...migo-app/src/java/org/sakaiproject/tool/assessment/bundle/AuthorMessages_zh_CN.properties
@@ -400,7 +400,6 @@ select_menu=\u9009\u62E9
 select_appropriate_format=\u9009\u62E9\u5E0C\u671B\u7684\u683C\u5F0F
 options_text=\u9009\u9879
 select_a_pool_name=\u9009\u62E9\u5E93\u540D\uFF08\u53EF\u9009\uFF09
-select_a_pool_for_random_draw=\u9009\u62E9\u4E00\u4E2A\u5E93\u540D
 select_num_questions=(\#\#\#)
 select_combo=\u9009\u62E9
 select_one=\u9009\u62E9\u4E00\u9879...

diff --git a/...go-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/EditPartListener.java b/...go-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/EditPartListener.java
@@ -160,6 +160,8 @@ private void populateMetaData(SectionFacade section, SectionBean bean)  {
 
        if (meta.getLabel().equals(SectionDataIfc.POOLID_FOR_RANDOM_DRAW)){
          bean.setSelectedPool(meta.getEntry());
+       } else {
+         bean.setSelectedPool(null);
        }
 
        if (meta.getLabel().equals(SectionDataIfc.NUM_QUESTIONS_DRAWN)){

diff --git a/samigo/samigo-app/src/webapp/jsf/author/editPart.jsp b/samigo/samigo-app/src/webapp/jsf/author/editPart.jsp
@@ -104,7 +104,6 @@
                     <h:outputText rendered="#{sectionBean.type == '2'}" value="#{authorMessages.random_draw_questions_suffix}"/>
                     <h:selectOneMenu rendered="#{sectionBean.type == '2'}" disabled="#{sectionBean.type == '1' || !author.isEditPendingAssessmentFlow}"
                                      id="assignToPool" value="#{sectionBean.selectedPool}">
-                        <%--<f:selectItem itemValue="" itemLabel="#{authorMessages.select_a_pool_for_random_draw}(###)" />--%>
                         <f:selectItems value="#{sectionBean.poolsAvailable}" />
                     </h:selectOneMenu>
                 </t:div>