Skip to content
Snippets Groups Projects
Commit 54f94bd1 authored by srosse's avatar srosse
Browse files

OO-4652: always calculate types of curriculum element based on parent

parent a411d476
No related branches found
No related tags found
No related merge requests found
...@@ -149,7 +149,7 @@ public class EditCurriculumElementController extends FormBasicController { ...@@ -149,7 +149,7 @@ public class EditCurriculumElementController extends FormBasicController {
uifactory.addStaticTextElement("curriculum.element.external.id", externalId, formLayout); uifactory.addStaticTextElement("curriculum.element.external.id", externalId, formLayout);
} }
boolean canEdit = element == null ? true : secCallback.canEditCurriculumElement(element); boolean canEdit = element == null || secCallback.canEditCurriculumElement(element);
String identifier = element == null ? "" : element.getIdentifier(); String identifier = element == null ? "" : element.getIdentifier();
identifierEl = uifactory.addTextElement("identifier", "curriculum.element.identifier", 255, identifier, formLayout); identifierEl = uifactory.addTextElement("identifier", "curriculum.element.identifier", 255, identifier, formLayout);
...@@ -309,9 +309,7 @@ public class EditCurriculumElementController extends FormBasicController { ...@@ -309,9 +309,7 @@ public class EditCurriculumElementController extends FormBasicController {
private List<CurriculumElementType> getTypes() { private List<CurriculumElementType> getTypes() {
List<CurriculumElementType> types; List<CurriculumElementType> types;
if(element != null) { if(parentElement != null) {
types = getTypes(element);
} else if(parentElement != null) {
types = getTypes(parentElement); types = getTypes(parentElement);
} else { } else {
types = new ArrayList<>(); types = new ArrayList<>();
...@@ -325,10 +323,10 @@ public class EditCurriculumElementController extends FormBasicController { ...@@ -325,10 +323,10 @@ public class EditCurriculumElementController extends FormBasicController {
return types; return types;
} }
private List<CurriculumElementType> getTypes(CurriculumElement curriculumElement) { private List<CurriculumElementType> getTypes(CurriculumElement curriculumParentElement) {
List<CurriculumElementType> types = new ArrayList<>(); List<CurriculumElementType> types = new ArrayList<>();
List<CurriculumElement> parentLine = curriculumService.getCurriculumElementParentLine(curriculumElement); List<CurriculumElement> parentLine = curriculumService.getCurriculumElementParentLine(curriculumParentElement);
for(int i=parentLine.size() - 1; i-->0; ) { for(int i=parentLine.size(); i-->0; ) {
CurriculumElement parent = parentLine.get(i); CurriculumElement parent = parentLine.get(i);
CurriculumElementType parentType = parent.getType(); CurriculumElementType parentType = parent.getType();
if(parentType != null) { if(parentType != null) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment