no-jira: fix strange behavior of the edit button of portfolio template

src/main/java/org/olat/portfolio/ui/EPTemplateRuntimeController.java

@@ -53,7 +53,6 @@ public class EPTemplateRuntimeController extends RepositoryEntryRuntimeControlle
 		if(getRuntimeController() instanceof EPMapViewController) {
 			EPMapViewController mapCtrl = (EPMapViewController)getRuntimeController();
 			if(mapCtrl.canEditStructure()) {
-				mapCtrl.delegateEditButton();
 				editLink = LinkFactory.createToolLink("edit.cmd", translate("details.openeditor"), this, "o_sel_repository_editor");
 				editLink.setElementCssClass("o_sel_ep_edit_map");
 				editLink.setIconLeftCSS("o_icon o_icon-lg o_icon_edit");

src/main/java/org/olat/portfolio/ui/structel/EPMapViewController.java

@@ -81,7 +81,6 @@ public class EPMapViewController extends BasicController implements Activateable
 	private EPStructureTreeAndDetailsEditController editCtrl;
 	private DialogBoxController confirmationSubmissionCtr;
 	private final boolean back;
-	private boolean editInToolbar = false;
 	
 	private EditMode editMode = EditMode.view;
 	private PortfolioStructureMap map;
@@ -135,12 +134,6 @@ public class EPMapViewController extends BasicController implements Activateable
 		return secCallback.canEditStructure();
 	}
 	
-	public void delegateEditButton() {
-		if(editButton != null) {
-			editButton.setVisible(false);
-		}
-	}
-
 	protected void initForm(UserRequest ureq) {
 		Identity ownerIdentity = ePFMgr.getFirstOwnerIdentity(map);
 		if(ownerIdentity != null) {
@@ -161,9 +154,6 @@ public class EPMapViewController extends BasicController implements Activateable
 			} else {
 				editButton.setCustomDisplayText(translate("map.editButton.off"));
 			}
-			if(editInToolbar) {
-				mainVc.remove(mainVc.getComponent("map.editButton"));
-			}
 		} 
 		if(back) {
 			backLink = LinkFactory.createLinkBack(mainVc, this);
@@ -262,6 +252,7 @@ public class EPMapViewController extends BasicController implements Activateable
 				selectedPage = pageCtrl.getSelectedPage();
 			}
 			initOrUpdateEditMode(ureq, selectedPage);
+			editMode = EditMode.editor;
 		}
 	}