Skip to content
Snippets Groups Projects
Commit 3ea8e6fa authored by srosse's avatar srosse
Browse files

OO-1018: pass event from "new controller" to the toc + structure controller

parent 89e14cde
No related branches found
No related tags found
No related merge requests found
...@@ -262,6 +262,7 @@ public class EPArtefactPoolRunController extends BasicController implements Acti ...@@ -262,6 +262,7 @@ public class EPArtefactPoolRunController extends BasicController implements Acti
// some artefacts were added, refresh view // some artefacts were added, refresh view
if (event.equals(Event.DONE_EVENT)) { if (event.equals(Event.DONE_EVENT)) {
initTPAllView(ureq); initTPAllView(ureq);
fireEvent(ureq, event);
} }
} else if (event instanceof EPArtefactChoosenEvent) { } else if (event instanceof EPArtefactChoosenEvent) {
// an artefact was choosen, pass through the event until top // an artefact was choosen, pass through the event until top
......
...@@ -133,28 +133,32 @@ public class EPAddElementsController extends BasicController { ...@@ -133,28 +133,32 @@ public class EPAddElementsController extends BasicController {
@Override @Override
protected void event(UserRequest ureq, Controller source, Event event) { protected void event(UserRequest ureq, Controller source, Event event) {
super.event(ureq, source, event); super.event(ureq, source, event);
if (source == artefactPoolCtrl && event instanceof EPArtefactChoosenEvent) { if (source == artefactPoolCtrl) {
// finally an artefact was choosen if(event instanceof EPArtefactChoosenEvent) {
EPArtefactChoosenEvent artCEv = (EPArtefactChoosenEvent) event; // finally an artefact was choosen
artefactBox.deactivate(); EPArtefactChoosenEvent artCEv = (EPArtefactChoosenEvent) event;
AbstractArtefact choosenArtefact = artCEv.getArtefact(); artefactBox.deactivate();
// check for a yet existing link to this artefact AbstractArtefact choosenArtefact = artCEv.getArtefact();
if (ePFMgr.isArtefactInStructure(choosenArtefact, portfolioStructure)) { // check for a yet existing link to this artefact
showWarning("artefact.already.in.structure"); if (ePFMgr.isArtefactInStructure(choosenArtefact, portfolioStructure)) {
} else { showWarning("artefact.already.in.structure");
boolean successfullLink = ePFMgr.addArtefactToStructure(getIdentity(), choosenArtefact, portfolioStructure);
if (successfullLink) {
getWindowControl().setInfo(
getTranslator().translate("artefact.choosen", new String[] { choosenArtefact.getTitle(), portfolioStructure.getTitle() }));
ThreadLocalUserActivityLogger.addLoggingResourceInfo(LoggingResourceable.wrapPortfolioOres(choosenArtefact));
ThreadLocalUserActivityLogger.log(EPLoggingAction.EPORTFOLIO_ARTEFACT_SELECTED, getClass());
} else { } else {
showError("restrictions.not.conform"); boolean successfullLink = ePFMgr.addArtefactToStructure(getIdentity(), choosenArtefact, portfolioStructure);
if (successfullLink) {
getWindowControl().setInfo(
getTranslator().translate("artefact.choosen", new String[] { choosenArtefact.getTitle(), portfolioStructure.getTitle() }));
ThreadLocalUserActivityLogger.addLoggingResourceInfo(LoggingResourceable.wrapPortfolioOres(choosenArtefact));
ThreadLocalUserActivityLogger.log(EPLoggingAction.EPORTFOLIO_ARTEFACT_SELECTED, getClass());
} else {
showError("restrictions.not.conform");
}
fireEvent(ureq, new EPStructureChangeEvent(EPStructureChangeEvent.ADDED, portfolioStructure));
} }
} else if(event == Event.DONE_EVENT) {
artefactBox.deactivate();
fireEvent(ureq, new EPStructureChangeEvent(EPStructureChangeEvent.ADDED, portfolioStructure)); fireEvent(ureq, new EPStructureChangeEvent(EPStructureChangeEvent.ADDED, portfolioStructure));
} }
}
}
} }
public void setShowLink(String... types) { public void setShowLink(String... types) {
......
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