Skip to content

Commit

Permalink
getPageBase -> getPageAdminLTE fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@KaterynaHonchar
KaterynaHonchar committed Jan 25, 2023
1 parent d7c28e8 commit f2f9e49
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 16 deletions.
4 changes: 2 additions & 2 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/BasePanel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,11 +142,11 @@ public PageAdminLTE getPageAdminLTE() {
}

public PrismContext getPrismContext() {
return getPageBase().getPrismContext();
return getPageAdminLTE().getPrismContext();
}

public SchemaService getSchemaService() {
return getPageBase().getSchemaService();
return getPageAdminLTE().getSchemaService();
}

protected String createComponentPath(String... components) {
Expand Down
12 changes: 6 additions & 6 deletions ...ui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/PrismContainerValuePanel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ public void onClick(AjaxRequestTarget target) {
}

protected LoadableDetachableModel<String> getLabelModel() {
return getPageBase().createStringResource("${displayName}", getModel());
return getPageAdminLTE().createStringResource("${displayName}", getModel());
}

@Override
Expand Down Expand Up @@ -225,19 +225,19 @@ protected void processSelectedChildren(AjaxRequestTarget target, List<PrismConta
}

private void prepareNewContainers(AjaxRequestTarget target, List<PrismContainerDefinition<?>> containers) {
Task task = getPageBase().createSimpleTask("Create child containers");
Task task = getPageAdminLTE().createSimpleTask("Create child containers");
WrapperContext ctx = new WrapperContext(task, task.getResult());
ctx.setCreateIfEmpty(true);
containers.forEach(container -> {
try {
ItemWrapper iw = getPageBase().createItemWrapper(container, getModelObject(), ctx);
ItemWrapper iw = getPageAdminLTE().createItemWrapper(container, getModelObject(), ctx);
if (iw != null) {
getModelObject().addItem(iw);
}
} catch (SchemaException e) {
OperationResult result = ctx.getResult();
result.recordFatalError(createStringResource("PrismContainerValuePanel.message.prepareNewContainers.fatalError", container).getString(), e);
getPageBase().showResult(ctx.getResult());
getPageAdminLTE().showResult(ctx.getResult());
}
});

Expand All @@ -254,7 +254,7 @@ private void onSortClicked(AjaxRequestTarget target) {
wrapper.setSorted(!wrapper.isSorted());
target.add(getValuePanel());
target.add(getSortButton());
target.add(getPageBase().getFeedbackPanel());
target.add(getPageAdminLTE().getFeedbackPanel());
}

private ToggleIconButton<Void> getSortButton() {
Expand All @@ -263,7 +263,7 @@ private ToggleIconButton<Void> getSortButton() {

public void refreshPanel(AjaxRequestTarget target) {
target.add(PrismContainerValuePanel.this);
target.add(getPageBase().getFeedbackPanel());
target.add(getPageAdminLTE().getFeedbackPanel());
}

protected ToggleIconButton<?> createExpandCollapseButton() {
Expand Down
2 changes: 1 addition & 1 deletion ...dmin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/PrismPropertyPanel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ protected void refreshPanel(AjaxRequestTarget target) {

@Override
protected boolean isRequired() {
ItemMandatoryHandler handler = getSettings().getMandatoryHandler();
ItemMandatoryHandler handler = (getSettings() != null) ? getSettings().getMandatoryHandler() : null;
if (handler != null) {
return handler.isMandatory(getModelObject());
}
Expand Down
13 changes: 7 additions & 6 deletions ...n-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFieldGroupPanel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ private String getGroupName(@NotNull FormDefinitionType formDefinition) {

private void initLayout(String groupName, List<AbstractFormItemType> formItems, Form<?> mainForm) {

Label header = new Label(ID_HEADER, getPageBase().getString(groupName, (Object[]) null));
Label header = new Label(ID_HEADER, getPageAdminLTE().getString(groupName, (Object[]) null));
add(header);

RepeatingView itemView = new RepeatingView(ID_PROPERTY);
Expand All @@ -80,7 +80,8 @@ private void initLayout(String groupName, List<AbstractFormItemType> formItems,
for (AbstractFormItemType formItem : formItems) {

if (formItem instanceof FormFieldGroupType) {
DynamicFieldGroupPanel<O> dynamicFieldGroupPanel = new DynamicFieldGroupPanel<>(itemView.newChildId(), formItem.getName(), getModel(), FormTypeUtil.getFormItems(((FormFieldGroupType) formItem).getFormItems()), mainForm, getPageBase());
DynamicFieldGroupPanel<O> dynamicFieldGroupPanel = new DynamicFieldGroupPanel<>(itemView.newChildId(),
formItem.getName(), getModel(), FormTypeUtil.getFormItems(((FormFieldGroupType) formItem).getFormItems()), mainForm, getPageAdminLTE());
dynamicFieldGroupPanel.setOutputMarkupId(true);
itemView.add(dynamicFieldGroupPanel);
continue;
Expand All @@ -89,7 +90,7 @@ private void initLayout(String groupName, List<AbstractFormItemType> formItems,
ItemWrapper<?, ?> itemWrapper = findAndTailorItemWrapper(formItem, getObjectWrapper());

try {
Panel panel = getPageBase().initItemPanel(itemView.newChildId(), itemWrapper.getTypeName(), Model.of(itemWrapper), null);
Panel panel = getPageAdminLTE().initItemPanel(itemView.newChildId(), itemWrapper.getTypeName(), Model.of(itemWrapper), null);
panel.setOutputMarkupId(true);
itemView.add(panel);
} catch (SchemaException e) {
Expand All @@ -116,7 +117,7 @@ private RepeatingView getRepeatingPropertyView() {
if (path == null) {
getSession().error("Bad form item definition. It has to contain reference to the real attribute");
LOGGER.error("Bad form item definition. It has to contain reference to the real attribute");
throw new RestartResponseException(getPageBase());
throw new RestartResponseException(getPageAdminLTE());
}

ItemWrapper<?, ?> itemWrapper;
Expand All @@ -125,13 +126,13 @@ private RepeatingView getRepeatingPropertyView() {
} catch (SchemaException e) {
getSession().error("Bad form item definition. No attribute with path: " + path + " was found");
LOGGER.error("Bad form item definition. No attribute with path: " + path + " was found");
throw new RestartResponseException(getPageBase());
throw new RestartResponseException(getPageAdminLTE());
}

if (itemWrapper == null) {
getSession().error("Bad form item definition. No attribute with path: " + path + " was found");
LOGGER.error("Bad form item definition. No attribute with path: " + path + " was found");
throw new RestartResponseException(getPageBase());
throw new RestartResponseException(getPageAdminLTE());
}
return itemWrapper;
}
Expand Down
2 changes: 1 addition & 1 deletion gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFormPanel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ private PrismObjectWrapper<O> createObjectWrapper(PrismObjectWrapperFactory<O> f
result.recordSuccess();
} catch (SchemaException e) {
result.recordFatalError(createStringResource("DynamicFormPanel.message.createObjectWrapper.fatalError", e.getMessage()).getString());
getPageBase().showResult(result);
getPageAdminLTE().showResult(result);

}
return objectWrapper;
Expand Down

0 comments on commit f2f9e49

Please sign in to comment.