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

OO-1899: remove properly the select and close links from the navigation bar

parent bda48ffb
No related branches found
No related tags found
No related merge requests found
...@@ -980,7 +980,7 @@ public class BaseFullWebappController extends BasicController implements DTabs, ...@@ -980,7 +980,7 @@ public class BaseFullWebappController extends BasicController implements DTabs,
// Remove tab itself // Remove tab itself
dtabs.remove(delt); dtabs.remove(delt);
dtabToBusinessPath.remove(delt); dtabToBusinessPath.remove(delt);
dtabsLinkNames.remove(dtabIndex); Integer tabId = dtabsLinkNames.remove(dtabIndex);
Controller tabCtr = dtabsControllers.get(dtabIndex); Controller tabCtr = dtabsControllers.get(dtabIndex);
dtabsControllers.remove(tabCtr); dtabsControllers.remove(tabCtr);
...@@ -992,9 +992,10 @@ public class BaseFullWebappController extends BasicController implements DTabs, ...@@ -992,9 +992,10 @@ public class BaseFullWebappController extends BasicController implements DTabs,
navTabsVc.setDirty(true); navTabsVc.setDirty(true);
// remove created links for dtab out of container // remove created links for dtab out of container
navTabsVc.remove(navTabsVc.getComponent("a" + delt.hashCode())); navTabsVc.remove(navTabsVc.getComponent("a" + tabId));
navTabsVc.remove(navTabsVc.getComponent("ca" + delt.hashCode())); navTabsVc.remove(navTabsVc.getComponent("c" + tabId));
navTabsVc.remove(navTabsVc.getComponent("cp" + delt.hashCode())); navTabsVc.remove(navTabsVc.getComponent("ca" + tabId));
navTabsVc.remove(navTabsVc.getComponent("cp" + tabId));
if (delt == curDTab && ureq != null) { // if we close the current tab -> return to the previous if (delt == curDTab && ureq != null) { // if we close the current tab -> return to the previous
popTheTabState(ureq); popTheTabState(ureq);
} // else just remove the dtabs } // else just remove the dtabs
......
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