Skip to content

Commit

Permalink
Merge pull request 'Ticket #28427: Clear stack only when the context …
Browse files Browse the repository at this point in the history
…component is the MainLayout.' (!575) from CWS/CWS_28427 into master

Reviewed-on: http://tl.bos.local:3000/TopLogic/tl-engine-7/pulls/575
Reviewed-by: jenkins <jenkins@top-logic.com>
Reviewed-by: Bernhard Haumacher <bernhard.haumacher@top-logic.com>
  • Loading branch information
dbusche committed Jan 10, 2025
2 parents 3357463 + defc8d1 commit 93cf628
Showing 1 changed file with 4 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import com.top_logic.mig.html.layout.DialogComponent;
import com.top_logic.mig.html.layout.DialogSupport;
import com.top_logic.mig.html.layout.LayoutComponent;
import com.top_logic.mig.html.layout.LayoutContainer;
import com.top_logic.mig.html.layout.MainLayout;
import com.top_logic.tool.boundsec.commandhandlers.GotoHandler;
import com.top_logic.util.TLContext;
Expand Down Expand Up @@ -85,10 +84,10 @@ public boolean isStackedComponent(LayoutComponent aComponent) {

@Override
public LayoutComponent gotoLayout(LayoutComponent contextComponent, Object targetObject, ComponentName targetComponentName) {
if (contextComponent instanceof LayoutContainer) {
/* No useful goto back to a LayoutContainer possible. Therefore no recording. Such can
* e.g. occur by executing a "stable bookmark". In such case the context component is
* the MainLayout. */
if (contextComponent instanceof MainLayout) {
/* No useful goto back to the MainLayout possible. Therefore no recording. Such can e.g.
* occur by executing a "stable bookmark". In such case the context component is the
* MainLayout. */
clearStack(contextComponent);
return super.gotoLayout(contextComponent, targetObject, targetComponentName);
}
Expand Down

0 comments on commit 93cf628

Please sign in to comment.