Skip to content

Commit

Permalink
fix of translation keys on resource wizard panels
Browse files Browse the repository at this point in the history
  • Loading branch information
skublik committed Aug 26, 2022
1 parent 05770e8 commit 4817480
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -50,17 +50,17 @@ protected String getPanelType() {

@Override
public IModel<String> getTitle() {
return createStringResource("PageResource.wizard.attributes.step.inbound");
return createStringResource("PageResource.wizard.step.configuration");
}

@Override
protected IModel<?> getTextModel() {
return createStringResource("PageResource.wizard.attributes.inbound.text");
return createStringResource("PageResource.wizard.step.attributes.inbound.text");
}

@Override
protected IModel<?> getSubTextModel() {
return createStringResource("PageResource.wizard.attributes.inbound.subText");
return createStringResource("PageResource.wizard.step.attributes.inbound.subText");
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,12 @@ public abstract class AttributeMappingsTable extends MultivalueContainerListPane
private static final Trace LOGGER = TraceManager.getTrace(AttributeMappingsTable.class);

private final IModel<PrismContainerValueWrapper<ResourceObjectTypeDefinitionType>> valueModel;
private final ResourceDetailsModel resourceDetailsModel;

public AttributeMappingsTable(
String id,
ResourceDetailsModel model,
IModel<PrismContainerValueWrapper<ResourceObjectTypeDefinitionType>> valueModel) {
super(id, MappingType.class);
resourceDetailsModel = model;
this.valueModel = valueModel;
}

Expand All @@ -75,6 +73,12 @@ protected void onBeforeRender() {
getTable().setShowAsCard(false);
}

@Override
protected boolean isHeaderVisible() {
return false;
}


@Override
protected List<Component> createToolbarButtonsList(String idButton) {
List<Component> buttons = super.createToolbarButtonsList(idButton);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ public void onClick(AjaxRequestTarget target) {

AjaxIconButton saveButton = new AjaxIconButton(
buttons.newChildId(),
Model.of("fa fa-circle-plus"),
Model.of("fa fa-floppy-disk"),
getPageBase().createStringResource("AttributeMappingsTableWizardPanel.saveButton")) {
@Override
public void onClick(AjaxRequestTarget target) {
Expand Down Expand Up @@ -194,7 +194,7 @@ private void onEditValue(IModel<PrismContainerValueWrapper<MappingType>> value,

@Override
protected IModel<String> getBreadcrumbLabel() {
return getPageBase().createStringResource("AttributeMappingsTableWizardPanel.title");
return getTextModel();
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@

import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;

/**
* @author lskublik
Expand All @@ -40,8 +41,7 @@ public class AttributeOutboundStepPanel extends AbstractValueFormResourceWizardS

private static final String PANEL_TYPE = "attributeOutboundWizard";

public AttributeOutboundStepPanel(ResourceDetailsModel model,
IModel<PrismContainerValueWrapper<MappingType>> newValueModel) {
public AttributeOutboundStepPanel(ResourceDetailsModel model, IModel<PrismContainerValueWrapper<MappingType>> newValueModel) {
super(model, newValueModel);
}

Expand All @@ -51,17 +51,17 @@ protected String getPanelType() {

@Override
public IModel<String> getTitle() {
return createStringResource("PageResource.wizard.attributes.step.outbound");
return createStringResource("PageResource.wizard.step.configuration");
}

@Override
protected IModel<?> getTextModel() {
return createStringResource("PageResource.wizard.attributes.outbound.text");
return createStringResource("PageResource.wizard.step.attributes.outbound.text");
}

@Override
protected IModel<?> getSubTextModel() {
return createStringResource("PageResource.wizard.attributes.outbound.subText");
return createStringResource("PageResource.wizard.step.attributes.outbound.subText");
}

@Override
Expand Down

0 comments on commit 4817480

Please sign in to comment.