Merge branch 'release/5.11.0'

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / ui / section / taxon / TaxonBaseDetailElement.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/TaxonBaseDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/TaxonBaseDetailElement.java
index d0bb5f144dec74b99c8e5989941e96ca7da95a69..62fce8bd7df6735f2fd60dc11b07dcec3f1ffc2f 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/TaxonBaseDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/TaxonBaseDetailElement.java
@@ -79,10 +79,10 @@ public class TaxonBaseDetailElement extends AbstractIdentifiableEntityDetailElem
                                 formElement, "Secundum",
                                entity.getSec(), EntitySelectionElement.ALL,
                                style);
-               if (!config.isSecEnabled() && config.isSimpleDetailsViewActivated()){
+               if (config != null && !config.isSecEnabled()){
                    selection_secundum.setEnabled(false);
                }
-               if (config.isSecDetailsActivated() || !config.isSimpleDetailsViewActivated()){
+               if (config != null && config.isSecDetailsActivated()){
                text_secundum_microreference = formFactory.createTextWithLabelElement(
                     formElement, "Detail",
                    entity.getSecMicroReference(),null,