Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

proposed Secetion and Container changes to fix touchUIPath property of @Tab when coral3 is being used #94

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ public class Container extends AbstractTouchUIDialogElement {

private final boolean maximized;

private String path;

private NameSpacedAttribute<String> title;

private final NameSpacedAttribute<Boolean> showOnCreate;
Expand All @@ -31,6 +33,11 @@ public Container(ContainerParameters parameters) {
margin = parameters.isMargin();
maximized = parameters.isMaximized();

if (StringUtils.isNotEmpty(parameters.getPath())) {
path = parameters.getPath();
}


if (StringUtils.isNotEmpty(parameters.getTitle())) {
title = new NameSpacedAttribute<String>(Constants.JCR_NS_URI, Constants.JCR_NS_PREFIX,
parameters.getTitle());
Expand Down Expand Up @@ -71,4 +78,8 @@ public NameSpacedAttribute<Boolean> getHideOnEdit() {
public NameSpacedAttribute<String> getOrderBefore() {
return orderBefore;
}

public String getPath() {
return path;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,16 @@ public class Section extends Container {

public static final String INCLUDE_RESOURCE_TYPE = "granite/ui/components/foundation/include";

private String path;

private String resourceType;

public Section(SectionParameters parameters) {
super(parameters);

if (StringUtils.isNotEmpty(parameters.getPath())) {
this.resourceType = RESOURCE_TYPE;
this.path = parameters.getPath();
}
}

public String getPath() {
return path;
}

public String getResourceType() {
return resourceType;
}
Expand Down