Project

General

Profile

« Previous | Next » 

Revision bb082354

Added by Katja Luther over 5 years ago

ref #7854: fix exceptions in distribution editor when saving new created descriptions

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AvailableDistributionStatusAdminWizard.java
20 20
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
21 21
import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
22 22
import eu.etaxonomy.cdm.api.service.ITermService;
23
import eu.etaxonomy.cdm.api.service.IVocabularyService;
24 23
import eu.etaxonomy.cdm.model.common.DefinedTermBase;
25 24
import eu.etaxonomy.cdm.model.metadata.CdmPreference;
26 25
import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
......
105 104
        savePref.setAllowOverride(pref.isAllowOverride());
106 105
        PreferencesUtil.setPreferenceToDB(savePref);
107 106
        Collection<DefinedTermBase> terms = new ArrayList<>();
108
        Collection<TermDto> termDtos = CdmStore.getService(IVocabularyService.class).getCompleteTermHierarchy(aPage.getVocabularies().get(0).getUuid());
109
        termDtos.forEach(dto -> terms.add(CdmStore.getService(ITermService.class).load(dto.getUuid())));
107
//        Collection<TermDto> termDtos = CdmStore.getService(IVocabularyService.class).getCompleteTermHierarchy(aPage.getVocabularies().get(0).getUuid());
108
//        termDtos.forEach(dto -> terms.add(CdmStore.getService(ITermService.class).load(dto.getUuid())));
109
//        CdmStore.getTermManager().setPreferredTerms(preferredTerms, terms);
110
        terms.addAll(CdmStore.getService(ITermService.class).listByTermType(this.aPage.type, null, 0, null, null));
111

  
112
//      aPage.getVocabularies().get(0).getTerms()
113
//      .forEach(dto -> terms.add(CdmStore.getService(ITermService.class).load(dto.getUuid())));
110 114
        CdmStore.getTermManager().setPreferredTerms(preferredTerms, terms);
115
        CdmStore.getTermManager().clearTermMapForTermType(this.aPage.type);
111 116
        PreferencesUtil.firePreferencesChanged(this.getClass());
112 117
        return true;
113 118
    }

Also available in: Unified diff