Project

General

Profile

« Previous | Next » 

Revision 6d3ee8c8

Added by Katja Luther over 12 years ago

Cascading problems for users having the rights to update taxa but not the explicit right for descriptions fixed

View differences:

cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/Taxon.java
87 87
	@XmlElementWrapper(name = "Descriptions")
88 88
	@XmlElement(name = "Description")
89 89
	@OneToMany(mappedBy="taxon", fetch= FetchType.LAZY) 
90
	@Cascade({CascadeType.SAVE_UPDATE, CascadeType.MERGE})
90
	@Cascade({CascadeType.SAVE_UPDATE, CascadeType.MERGE, CascadeType.DELETE, CascadeType.DELETE_ORPHAN})
91
	//@Cascade({CascadeType.MERGE, CascadeType.DELETE, CascadeType.DELETE_ORPHAN})
91 92
	@NotNull
92 93
	private Set<TaxonDescription> descriptions = new HashSet<TaxonDescription>();
93 94

  
......
144 145
    @XmlIDREF
145 146
    @XmlSchemaType(name = "IDREF")
146 147
    @OneToMany(mappedBy="taxon", fetch=FetchType.LAZY)
147
    @Cascade({CascadeType.SAVE_UPDATE, CascadeType.MERGE})
148
    //@Cascade({CascadeType.SAVE_UPDATE, CascadeType.MERGE})
148 149
	private Set<TaxonNode> taxonNodes = new HashSet<TaxonNode>();
149 150

  
150 151
	//cached number of taxonomic children

Also available in: Unified diff