fix for polystring languages

Evolveum · Aug 21, 2019 · 6736ec7 · 6736ec7
1 parent 4b0b66c
commit 6736ec7
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/...i/src/main/java/com/evolveum/midpoint/gui/impl/prism/component/PolyStringEditorPanel.java b/...i/src/main/java/com/evolveum/midpoint/gui/impl/prism/component/PolyStringEditorPanel.java
@@ -284,7 +284,7 @@ protected void onUpdate(AjaxRequestTarget target) {
 
                             @Override
                             protected void onUpdate(AjaxRequestTarget ajaxRequestTarget) {
-                                updateLanguageValue(languageName.getBaseFormComponent().getValue(), newLanguageValue.getBaseFormComponent().getValue());
+                                updateLanguageValue(languageName.getBaseFormComponent().getValue(), translation.getBaseFormComponent().getValue());
                             }
                         });
                         listItem.add(translation);
@@ -354,6 +354,10 @@ private IModel<List<String>> getLanguagesListModel(){
             public List<String> getObject() {
                 Map<String, String> languagesMap = isPolyStringLangNotNull() ? getModelObject().getLang() : new HashMap<>();
                 List<String> languagesList = new ArrayList<>(languagesMap.keySet());
+                String valueToExclude = getLanguagesChoicePanel().getBaseFormComponent().getModel().getObject();
+                if (StringUtils.isNotEmpty(valueToExclude)) {
+                    languagesList.remove(valueToExclude);
+                }
                 Collections.sort(languagesList);
                 return languagesList;
             }
@@ -444,4 +448,8 @@ private String getLanguageValueByKey(String key){
         }
         return getModelObject().getLang().get(key);
     }
+
+    private DropDownChoicePanel<String> getLanguagesChoicePanel(){
+        return (DropDownChoicePanel<String>)get(ID_FULL_DATA_CONTAINER).get(ID_LANGUAGE_EDITOR).get(ID_LANGUAGES_LIST);
+    }
 }