Project

General

Profile

Revision 775c87a6

ID775c87a65fbcf6cef8c955d1f69b1cc11d07230f
Parent 068197fd
Child 3bf04fa1

Added by Andreas Kohlbecker almost 2 years ago

ref #7899 starting 'Incorrect name' editor without mode VALIDATE_AGAINST_HIGHER_NAME_PART and hiding 'Ortographic correction' toggle

View differences:

src/main/java/eu/etaxonomy/cdm/vaadin/view/name/TaxonNameEditorPresenter.java
567 567
                    .forEach(m -> namePopup.enableMode(m));
568 568
                if(boundPropertyId.matches("orthographicVariant.otherName") && getView().isModeEnabled(TaxonNamePopupEditorMode.ORTHOGRAPHIC_CORRECTION)){
569 569
                    namePopup.enableMode(TaxonNamePopupEditorMode.NOMENCLATURALREFERENCE_SECTION_EDITING_ONLY);
570
                    namePopup.disableMode(TaxonNamePopupEditorMode.VALIDATE_AGAINST_HIGHER_NAME_PART);
571
                    namePopup.getOrthographicVariantToggle().setVisible(false);
570 572
                }
571 573
                namePopup.loadInEditor(event.getEntityUuid());
572 574
            }
......
613 615
                        .forEach(m -> namePopup.enableMode(m));
614 616
                if(boundPropertyId.matches("orthographicVariant.otherName") && getView().isModeEnabled(TaxonNamePopupEditorMode.ORTHOGRAPHIC_CORRECTION)){
615 617
                    namePopup.enableMode(TaxonNamePopupEditorMode.NOMENCLATURALREFERENCE_SECTION_EDITING_ONLY);
618
                    namePopup.disableMode(TaxonNamePopupEditorMode.VALIDATE_AGAINST_HIGHER_NAME_PART);
616 619
                    Reference nomrefPreset = (Reference)((AbstractPopupEditor<TaxonNameDTO, TaxonNameEditorPresenter>)getView()).getBean().getNomenclaturalReference();
617 620
                    namePopup.setCdmEntityInstantiator(new BeanInstantiator<TaxonName>() {
618 621

  
......
623 626
                            return newTaxonName;
624 627
                        }
625 628
                    });
629
                    namePopup.getOrthographicVariantToggle().setVisible(false);
626 630
                }
627 631
                namePopup.loadInEditor(null);
628 632
            }
src/main/java/eu/etaxonomy/cdm/vaadin/view/name/TaxonNamePopupEditor.java
1037 1037
        return infraSpecificEpithetField;
1038 1038
    }
1039 1039

  
1040
    @Override
1041
    public CheckBox getOrthographicVariantToggle() {
1042
        return orthographicVariantToggle;
1043
    }
1044

  
1040 1045

  
1041 1046
}
src/main/java/eu/etaxonomy/cdm/vaadin/view/name/TaxonNamePopupEditorView.java
118 118

  
119 119
    public NameRelationField getOrthographicVariantField();
120 120

  
121
    CheckBox getOrthographicVariantToggle();
122

  
121 123

  
122 124
}

Also available in: Unified diff

Add picture from clipboard (Maximum size: 40 MB)