From 6c93f522c97e0505c8a7788f51039be9e0944048 Mon Sep 17 00:00:00 2001 From: kate Date: Mon, 15 Apr 2019 23:12:50 +0200 Subject: [PATCH] systemName usage --- .../web/component/dialog/HelpInfoPanel.java | 14 +++------ .../web/component/form/DropDownFormGroup.java | 24 +++++---------- .../wizard/resource/SchemaHandlingStep.html | 2 +- .../wizard/resource/SchemaHandlingStep.java | 2 ++ .../ResourceActivationEditor.html | 16 +++++----- .../ResourceActivationEditor.java | 30 +++++++++++++++---- .../SynchronizationActionEditorDialog.java | 9 ++++-- .../configuration/PageRepositoryQuery.html | 4 +-- .../configuration/PageRepositoryQuery.java | 9 +++++- .../self/component/ChangePasswordPanel.java | 17 ++++++++--- .../localization/Midpoint.properties | 16 +++++----- .../localization/Midpoint_en.properties | 16 +++++----- 12 files changed, 94 insertions(+), 65 deletions(-) diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/HelpInfoPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/HelpInfoPanel.java index f1582c50b23..cf156a3598e 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/HelpInfoPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/HelpInfoPanel.java @@ -21,22 +21,16 @@ public HelpInfoPanel(String id){ this(id, null); } - public HelpInfoPanel(String id, String messageKey){ + public HelpInfoPanel(String id, IModel messageModel){ super (id); - initLayout(messageKey); + initLayout(messageModel); } - public void initLayout(final String messageKey){ + public void initLayout(final IModel messageModel){ WebMarkupContainer content = new WebMarkupContainer(ID_CONTENT); add(content); - Label helpLabel = new Label(ID_HELP, new IModel() { - - @Override - public String getObject() { - return getString(messageKey); - } - }); + Label helpLabel = new Label(ID_HELP, messageModel); helpLabel.setEscapeModelStrings(false); content.add(helpLabel); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/DropDownFormGroup.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/DropDownFormGroup.java index ede8bc56ecc..7be8136f4fa 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/DropDownFormGroup.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/DropDownFormGroup.java @@ -54,27 +54,27 @@ public class DropDownFormGroup extends BasePanel { public DropDownFormGroup(String id, IModel value, IModel> choices, IChoiceRenderer renderer, IModel label, String labelCssClass, String textCssClass, boolean required, boolean isSimilarAsPropertyPanel) { - this(id, value, choices, renderer, label, null, false, labelCssClass, textCssClass, required, isSimilarAsPropertyPanel); + this(id, value, choices, renderer, label, Model.of(), false, labelCssClass, textCssClass, required, isSimilarAsPropertyPanel); } public DropDownFormGroup(String id, IModel value, IModel> choices, IChoiceRenderer renderer, IModel label, String labelCssClass, String textCssClass, boolean required) { - this(id, value, choices, renderer, label, null, false, labelCssClass, textCssClass, required, false); + this(id, value, choices, renderer, label, Model.of(), false, labelCssClass, textCssClass, required, false); } public DropDownFormGroup(String id, IModel value, IModel> choices, IChoiceRenderer renderer, IModel label, String tooltipKey, boolean isTooltipInModal, String labelCssClass, String textCssClass, boolean required) { - this(id, value, choices, renderer, label, tooltipKey, isTooltipInModal, labelCssClass, textCssClass, required, false); + this(id, value, choices, renderer, label, Model.of(tooltipKey), isTooltipInModal, labelCssClass, textCssClass, required, false); } - public DropDownFormGroup(String id, IModel value, IModel> choices, IChoiceRenderer renderer, IModel label, String tooltipKey, + public DropDownFormGroup(String id, IModel value, IModel> choices, IChoiceRenderer renderer, IModel label, IModel tooltipModel, boolean isTooltipInModal, String labelCssClass, String textCssClass, boolean required, boolean isSimilarAsPropertyPanel) { super(id, value); - initLayout(choices, renderer, label, tooltipKey, isTooltipInModal, labelCssClass, textCssClass, required, isSimilarAsPropertyPanel); + initLayout(choices, renderer, label, tooltipModel, isTooltipInModal, labelCssClass, textCssClass, required, isSimilarAsPropertyPanel); } - private void initLayout(IModel> choices, IChoiceRenderer renderer, IModel label, final String tooltipKey, + private void initLayout(IModel> choices, IChoiceRenderer renderer, IModel label, final IModel tooltipModel, boolean isTooltipInModal, String labelCssClass, String textCssClass, final boolean required, boolean isSimilarAsPropertyPanel) { WebMarkupContainer labelContainer = new WebMarkupContainer(ID_LABEL_CONTAINER); @@ -93,15 +93,7 @@ private void initLayout(IModel> choices, IChoiceRenderer renderer, IM labelContainer.add(l); Label tooltipLabel = new Label(ID_TOOLTIP, new Model<>()); - tooltipLabel.add(new AttributeAppender("data-original-title", new IModel() { - - private static final long serialVersionUID = 1L; - - @Override - public String getObject() { - return getString(tooltipKey); - } - })); + tooltipLabel.add(new AttributeAppender("data-original-title", tooltipModel)); tooltipLabel.add(new InfoTooltipBehavior(isTooltipInModal)); tooltipLabel.add(new VisibleEnableBehaviour() { @@ -109,7 +101,7 @@ public String getObject() { @Override public boolean isVisible() { - return tooltipKey != null; + return tooltipModel != null && StringUtils.isNotEmpty(tooltipModel.getObject()); } }); tooltipLabel.setOutputMarkupId(true); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.html index e8e4f37fc77..c2dfbd06c99 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.html +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.html @@ -181,7 +181,7 @@

- +
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.java index ca76db2c840..b10379aa7f2 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.java @@ -575,6 +575,8 @@ protected void onSubmit(AjaxRequestTarget target) { editor.add(assignmentPolicyRefTooltip); Label iterationTooltip = new Label(ID_T_ITERATION); + iterationTooltip.add(AttributeAppender.append("title", createStringResource("SchemaHandlingStep.tooltip.iteration", + WebComponentUtil.getMidpointCustomSystemName(getPageBase(), "midpoint.default.system.name")))); iterationTooltip.add(new InfoTooltipBehavior()); editor.add(iterationTooltip); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceActivationEditor.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceActivationEditor.html index 6c35308268e..62bfab0a1c7 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceActivationEditor.html +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceActivationEditor.html @@ -49,7 +49,7 @@

- +
@@ -58,7 +58,7 @@

- +
@@ -93,7 +93,7 @@

- +
@@ -102,7 +102,7 @@

- +
@@ -138,7 +138,7 @@

- +
@@ -147,7 +147,7 @@

- +
@@ -183,7 +183,7 @@

- +
@@ -192,7 +192,7 @@

- +
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceActivationEditor.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceActivationEditor.java index 68c5f4d1fd2..26e60f17859 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceActivationEditor.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceActivationEditor.java @@ -28,8 +28,8 @@ import com.evolveum.midpoint.web.component.wizard.resource.dto.MappingTypeDto; import com.evolveum.midpoint.web.util.InfoTooltipBehavior; import com.evolveum.midpoint.xml.ns._public.common.common_3.*; -import com.evolveum.prism.xml.ns._public.types_3.ItemPathType; import org.apache.wicket.ajax.AjaxRequestTarget; +import org.apache.wicket.behavior.AttributeAppender; import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.form.DropDownChoice; @@ -37,8 +37,7 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.model.PropertyModel; - -import java.util.List; +import org.apache.wicket.model.StringResourceModel; /** * @author shood @@ -89,10 +88,17 @@ public class ResourceActivationEditor extends BasePanel readOnlyModel; public ResourceActivationEditor(String id, IModel model, NonEmptyModel readOnlyModel) { super(id, model); - initLayout(readOnlyModel); + this.readOnlyModel = readOnlyModel; + } + + @Override + protected void onInitialize(){ + super.onInitialize(); + initLayout(); } @Override @@ -209,7 +215,7 @@ private void prepareActivationObject(ResourceActivationDefinitionType activation } } - protected void initLayout(NonEmptyModel readOnlyModel) { + protected void initLayout() { prepareActivationPanelBody(ResourceActivationDefinitionType.F_EXISTENCE.getLocalPart(), ID_EXISTENCE_FS, ID_EXISTENCE_OUT, ID_EXISTENCE_IN, readOnlyModel); @@ -227,11 +233,13 @@ protected void initLayout(NonEmptyModel readOnlyModel) { add(exFetchTooltip); Label exOutTooltip = new Label(ID_T_EX_OUT); + exOutTooltip.add(AttributeAppender.append("title", getSystemNameDependentTooltipModel("SchemaHandlingStep.activation.tooltip.outbound"))); exOutTooltip.add(new InfoTooltipBehavior()); add(exOutTooltip); Label exInTooltip = new Label(ID_T_EX_IN); exInTooltip.add(new InfoTooltipBehavior()); + exInTooltip.add(AttributeAppender.append("title", getSystemNameDependentTooltipModel("SchemaHandlingStep.activation.tooltip.inbound"))); add(exInTooltip); Label admFetchTooltip = new Label(ID_T_ADM_FETCH); @@ -239,11 +247,13 @@ protected void initLayout(NonEmptyModel readOnlyModel) { add(admFetchTooltip); Label admOutTooltip = new Label(ID_T_ADM_OUT); + admOutTooltip.add(AttributeAppender.append("title", getSystemNameDependentTooltipModel("SchemaHandlingStep.activation.tooltip.outbound"))); admOutTooltip.add(new InfoTooltipBehavior()); add(admOutTooltip); Label admInTooltip = new Label(ID_T_ADM_IN); admInTooltip.add(new InfoTooltipBehavior()); + admInTooltip.add(AttributeAppender.append("title", getSystemNameDependentTooltipModel("SchemaHandlingStep.activation.tooltip.inbound"))); add(admInTooltip); Label validFromFetchTooltip = new Label(ID_T_VALID_F_FETCH); @@ -251,10 +261,12 @@ protected void initLayout(NonEmptyModel readOnlyModel) { add(validFromFetchTooltip); Label validFromOutTooltip = new Label(ID_T_VALID_F_OUT); + validFromOutTooltip.add(AttributeAppender.append("title", getSystemNameDependentTooltipModel("SchemaHandlingStep.activation.tooltip.outbound"))); validFromOutTooltip.add(new InfoTooltipBehavior()); add(validFromOutTooltip); Label validFromInTooltip = new Label(ID_T_VALID_F_IN); + validFromInTooltip.add(AttributeAppender.append("title", getSystemNameDependentTooltipModel("SchemaHandlingStep.activation.tooltip.inbound"))); validFromInTooltip.add(new InfoTooltipBehavior()); add(validFromInTooltip); @@ -263,10 +275,12 @@ protected void initLayout(NonEmptyModel readOnlyModel) { add(validToFetchTooltip); Label validToOutTooltip = new Label(ID_T_VALID_T_OUT); + validToOutTooltip.add(AttributeAppender.append("title", getSystemNameDependentTooltipModel("SchemaHandlingStep.activation.tooltip.outbound"))); validToOutTooltip.add(new InfoTooltipBehavior()); add(validToOutTooltip); Label validToInTooltip = new Label(ID_T_VALID_T_IN); + validToInTooltip.add(AttributeAppender.append("title", getSystemNameDependentTooltipModel("SchemaHandlingStep.activation.tooltip.inbound"))); validToInTooltip.add(new InfoTooltipBehavior()); add(validToInTooltip); @@ -356,4 +370,10 @@ private void mappingEditPerformed(AjaxRequestTarget target, MappingType mapping, window.updateModel(target, mapping, isInbound); window.show(target); } + + private StringResourceModel getSystemNameDependentTooltipModel(String key){ + return createStringResource(key, + WebComponentUtil.getMidpointCustomSystemName(getPageBase(), + createStringResource("midpoint.default.system.name").getString())); + } } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/synchronization/SynchronizationActionEditorDialog.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/synchronization/SynchronizationActionEditorDialog.java index 68c53ee4142..f9ee1017bd6 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/synchronization/SynchronizationActionEditorDialog.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/synchronization/SynchronizationActionEditorDialog.java @@ -133,7 +133,9 @@ private void initLayout(WebMarkupContainer content){ new PropertyModel<>(model, SynchronizationActionTypeDto.F_HANDLER_URI), WebComponentUtil.createReadonlyModelFromEnum(SynchronizationActionTypeDto.HandlerUriActions.class), new EnumChoiceRenderer<>(this), createStringResource("SynchronizationActionEditorDialog.label.handlerUri"), - "SynchronizationStep.action.tooltip.handlerUri", true, ID_LABEL_SIZE, ID_INPUT_SIZE, false){ + createStringResource("SynchronizationStep.action.tooltip.handlerUri", + WebComponentUtil.getMidpointCustomSystemName((PageResourceWizard)getPage(), "midpoint.default.system.name")), + true, ID_LABEL_SIZE, ID_INPUT_SIZE, false, false){ @Override protected DropDownChoice createDropDown(String id, IModel> choices, @@ -148,7 +150,10 @@ protected DropDownChoice createDropDown(String id, IModel order = new DropDownFormGroup(ID_ORDER, new PropertyModel<>(model, SynchronizationActionTypeDto.F_ACTION_OBJECT + ".order"), WebComponentUtil.createReadonlyModelFromEnum(BeforeAfterType.class), new EnumChoiceRenderer<>(this), - createStringResource("SynchronizationActionEditorDialog.label.order"), "SynchronizationStep.action.tooltip.order", true, ID_LABEL_SIZE, ID_INPUT_SIZE, false){ + createStringResource("SynchronizationActionEditorDialog.label.order"), + createStringResource("SynchronizationStep.action.tooltip.order", + WebComponentUtil.getMidpointCustomSystemName((PageResourceWizard)getPage(), "midpoint.default.system.name")), + true, ID_LABEL_SIZE, ID_INPUT_SIZE, false, false){ @Override protected DropDownChoice createDropDown(String id, IModel> choices, IChoiceRenderer renderer, boolean required){ diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageRepositoryQuery.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageRepositoryQuery.html index 6f094babff1..3fc5bf0d3ee 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageRepositoryQuery.html +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageRepositoryQuery.html @@ -35,7 +35,7 @@

-

+

@@ -46,7 +46,7 @@

-

+

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageRepositoryQuery.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageRepositoryQuery.java index 2aee4d987dd..498968a2677 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageRepositoryQuery.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageRepositoryQuery.java @@ -102,6 +102,7 @@ public class PageRepositoryQuery extends PageAdminConfiguration { private static final String ID_MAIN_FORM = "mainForm"; private static final String ID_REPOSITORY_QUERY_LABEL = "repositoryQueryLabel"; + private static final String ID_QUERY_VS_FILTER_NOTE = "queryVsFilterNote"; private static final String ID_MIDPOINT_QUERY_BUTTON_BAR = "midPointQueryButtonBar"; private static final String ID_EXECUTE_MIDPOINT = "executeMidPoint"; private static final String ID_COMPILE_MIDPOINT = "compileMidPoint"; @@ -220,10 +221,16 @@ protected void onUpdate(AjaxRequestTarget target) { hibernateParameters.setMode(null); mainForm.add(hibernateParameters); - WebMarkupContainer hibernateParametersNote = new WebMarkupContainer(ID_HIBERNATE_PARAMETERS_NOTE); + Label hibernateParametersNote = new Label(ID_HIBERNATE_PARAMETERS_NOTE, createStringResource("PageRepositoryQuery.hibernateParametersNote", + WebComponentUtil.getMidpointCustomSystemName(PageRepositoryQuery.this, "midPoint"))); hibernateParametersNote.setVisible(isAdmin); mainForm.add(hibernateParametersNote); + Label queryVsFilterNote = new Label(ID_QUERY_VS_FILTER_NOTE, createStringResource("PageRepositoryQuery.queryVsFilterNote", + WebComponentUtil.getMidpointCustomSystemName(PageRepositoryQuery.this, "midPoint"))); + queryVsFilterNote.setOutputMarkupId(true); + mainForm.add(queryVsFilterNote); + WebMarkupContainer midPointQueryButtonBar = new WebMarkupContainer(ID_MIDPOINT_QUERY_BUTTON_BAR); midPointQueryButtonBar.setOutputMarkupId(true); mainForm.add(midPointQueryButtonBar); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/ChangePasswordPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/ChangePasswordPanel.java index ca067dff2b5..4e6090bdf0f 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/ChangePasswordPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/ChangePasswordPanel.java @@ -75,18 +75,25 @@ public class ChangePasswordPanel extends BasePanel { private LoadableModel model; private boolean midpointAccountSelected = true; + private boolean oldPasswordVisible = false; public ChangePasswordPanel(String id, boolean oldPasswordVisible) { super(id); - initLayout(oldPasswordVisible); + this.oldPasswordVisible = oldPasswordVisible; } public ChangePasswordPanel(String id, boolean oldPasswordVisible, LoadableModel model, MyPasswordsDto myPasswordsDto) { super(id, model); - initLayout(oldPasswordVisible); + this.oldPasswordVisible = oldPasswordVisible; } - private void initLayout(final boolean oldPasswordVisible) { + @Override + protected void onInitialize(){ + super.onInitialize(); + initLayout(); + } + + private void initLayout() { model = (LoadableModel) getModel(); Label oldPasswordLabel = new Label(ID_OLD_PASSWORD_LABEL, createStringResource("PageSelfCredentials.oldPasswordLabel")); @@ -267,7 +274,9 @@ private void updatePropagatedAccountIconsCssClass(String cssClassName) { } private void showHelpPerformed(AjaxRequestTarget target){ - getPageBase().showMainPopup(new HelpInfoPanel(getPageBase().getMainPopupBodyId(), "ChangePasswordPanel.helpInfo") { + getPageBase().showMainPopup(new HelpInfoPanel(getPageBase().getMainPopupBodyId(), + createStringResource("ChangePasswordPanel.helpInfo", + WebComponentUtil.getMidpointCustomSystemName(getPageBase(), "midpoint.default.system.name"))) { @Override protected void closePerformed(AjaxRequestTarget target) { getPageBase().hideMainPopup(target); diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint.properties b/gui/admin-gui/src/main/resources/localization/Midpoint.properties index aef3b5bdb63..daf89ee8926 100755 --- a/gui/admin-gui/src/main/resources/localization/Midpoint.properties +++ b/gui/admin-gui/src/main/resources/localization/Midpoint.properties @@ -1303,7 +1303,7 @@ PageRepositoryQuery.objectType=Object type: PageRepositoryQuery.checkBox.distinct=Distinct PageRepositoryQuery.hibernateQuery=Hibernate query PageRepositoryQuery.hibernateParameters=Query parameters -PageRepositoryQuery.hibernateParametersNote=Note: The parameters are shown here only to indicate how midPoint query is translated into hibernate query. \ +PageRepositoryQuery.hibernateParametersNote=Note: The parameters are shown here only to indicate how {0} query is translated into hibernate query. \ They are not used when manually executing a hibernate query, so the query you enter here should contain no references to parameters. PageRepositoryQuery.incompleteResultsNote=Because you do not have administrator rights, results shown here were probably filtered by \ applying additional search conditions derived from your authorizations. These additional conditions are not visible \ @@ -1324,7 +1324,7 @@ PageRepositoryQuery.sample.UserType_UsersThatHaveARole=Users that have active as PageRepositoryQuery.sample.UserType_SpecifiedCostCenters=Users in cost centers 100000-999999 or X100-X999 PageRepositoryQuery.sample.ShadowType_ShadowsOnGivenResource=Shadows on a given resource PageRepositoryQuery.sample.UserType_UsersWithShadowOnGivenResource=Users with linked shadow on a given resource -PageRepositoryQuery.queryVsFilterNote=Note: midPoint query contains a filter along with paging instruction, wrapped together within the <query> element. \ +PageRepositoryQuery.queryVsFilterNote=Note: {0} query contains a filter along with paging instruction, wrapped together within the <query> element. \ In contrast, when used in "Advanced filter" in GUI, only the <filter> sub-element is applicable. Paging is managed by the GUI itself. PageCert.ago={0} ago PageCertCampaign.basic=Basic @@ -2894,8 +2894,8 @@ RunReportPopupPanel.title=Report configuration before run runUntilNodeDown.error1=Compatible data for 'Thread stop action' are: Close, Suspend runUntilNodeDown.error2=Compatible data for 'Thread stop action' are: Restart, Reschedule SchemaHandlingStep.activation.tooltip.fetchStrategy=How to fetch the attribute when it is needed. Implicit: the attribute is returned by default, it does not need to be requested; Explicit: the attribute is not returned by default, always request it explicitly. -SchemaHandlingStep.activation.tooltip.inbound=Inbound mappings map values from the resource (usually an account) to the Identity Manager (usually a user). -SchemaHandlingStep.activation.tooltip.outbound=Outbound mappings map values from Identity Manager (usually a user) to the resource (usually an account). +SchemaHandlingStep.activation.tooltip.inbound=Inbound mappings map values from the resource (usually an account) to the {0} (usually a user). +SchemaHandlingStep.activation.tooltip.outbound=Outbound mappings map values from {0} (usually a user) to the resource (usually an account). SchemaHandlingStep.association.label.associationName=Association name SchemaHandlingStep.association.label.associationNamespace=Namespace SchemaHandlingStep.association.tooltip.associationAttribute=Name of the attribute that "holds" the association. I.e. an attribute which contains the identifier of the associated object. This is usually an attribute such as "member", "groups", "roles", etc. In subject-to-object associations this is an attribute of a subject (e.g. account attribute "groups"). In object-to-subject associations this is an attribute of an object (e.g. group attribute "members"). @@ -2989,7 +2989,7 @@ SchemaHandlingStep.tooltip.default=If set to true then this definition is the de SchemaHandlingStep.tooltip.dependency=Dependencies are object types that has to be processed before this object types is processed. I.e. this object type depends on them. The object types on which this object type depends will be provisioned before this object type. Dependencies are used to impose ordering into provisioning operations. SchemaHandlingStep.tooltip.filterClause=TODO: SchemaHandlingStep.tooltip.filterClause SchemaHandlingStep.tooltip.intent=Intent specifies what system should do with the object. Intent sorts objects of the same kind into several categories. Objects with different intents may be handled differently by system. -SchemaHandlingStep.tooltip.iteration=Iteratively find values for unique attributes such as identifiers. Identity Manager will try several times to find a unique value for such attributes. +SchemaHandlingStep.tooltip.iteration=Iteratively find values for unique attributes such as identifiers. {0} will try several times to find a unique value for such attributes. SchemaHandlingStep.tooltip.kind=Kind specified what this object is, whether it is account, entitlement or something else. SchemaHandlingStep.tooltip.objectClass=Object class from the schema that will be used to construct instances of this object type. SchemaHandlingStep.tooltip.protected=Specification of protected instances of this object type. System can see protected instances but they cannot be touched. Any attempt to modify them will fail. This is used to protect emergency administration accounts such as "root" or "administrator". @@ -3107,8 +3107,8 @@ SynchronizationReactionEditor.label.objectTemplateRef=Object template ref. SynchronizationReactionEditor.label.reconcile=Reconcile SynchronizationReactionEditor.label.situation=Situation SynchronizationReactionEditor.label.synchronize=Synchronize -SynchronizationStep.action.tooltip.handlerUri=The explicit action to execute. Please note that most actions are designed to work with the default Identity Manager's synchronization algorithm and that this algorithm will be executed unless it was explicitly disabled (and then the result may be an error). Also note that even if no explicit action is selected system will still do the default synchronization algorithm if the "synchronize" option was selected. -SynchronizationStep.action.tooltip.order=Whether the explicit action is executed before Identity Manager's default synchronization algorithms or after them. Most built-in actions are designed to be executed before system synchronization as they only set up the model context and then they let system to do the real work. However some custom action may need to be executed after the synchronization, e.g. to deliver notifications, clean up, etc. +SynchronizationStep.action.tooltip.handlerUri=The explicit action to execute. Please note that most actions are designed to work with the default {0}'s synchronization algorithm and that this algorithm will be executed unless it was explicitly disabled (and then the result may be an error). Also note that even if no explicit action is selected system will still do the default synchronization algorithm if the "synchronize" option was selected. +SynchronizationStep.action.tooltip.order=Whether the explicit action is executed before {0}'s default synchronization algorithms or after them. Most built-in actions are designed to be executed before system synchronization as they only set up the model context and then they let system to do the real work. However some custom action may need to be executed after the synchronization, e.g. to deliver notifications, clean up, etc. SynchronizationStep.button.add=Add synchronization object SynchronizationStep.label.condition=Condition SynchronizationStep.label.confirmation=Confirmation @@ -3490,7 +3490,7 @@ ChangePasswordPanel.legendMessage.selected= - Password will be changed ChangePasswordPanel.legendMessage.propagated= - Automatic password propagation (based on policies defined in resources definitions) ChangePasswordPanel.legendMessage.deselected= - Password will not be changed ChangePasswordPanel.legendMessage.no.password.capability= - Password capability is not supported by resource -ChangePasswordPanel.helpInfo=

This portion of the credentials dialog controls how the password change will be propagated to each individual system. The first line defines whether the password will be changed in the Identity Manager itself. Following lines represent each system for which the password can be changed. The password propagation is controlled by the icons:

  • Password will be changed. Password for this system will be changed to the value specified in the password dialog above.
  • Automatic password propagation. The password might be changed. Whether the password is changed or not depends on the policies set up by identity administrator. This usually means that the password will be changed if it makes sense for the current situation and settings. This is the reasonable default choice.
  • Password will not be changed for this system.
  • Password capability is not supported for this system. As the result, password will not be changed for this system.

You can adjust the password propagation settings by clicking on the icons and thus fine-tune how the password change is propagated to each individual system.

+ChangePasswordPanel.helpInfo=

This portion of the credentials dialog controls how the password change will be propagated to each individual system. The first line defines whether the password will be changed in the {0} itself. Following lines represent each system for which the password can be changed. The password propagation is controlled by the icons:

  • Password will be changed. Password for this system will be changed to the value specified in the password dialog above.
  • Automatic password propagation. The password might be changed. Whether the password is changed or not depends on the policies set up by identity administrator. This usually means that the password will be changed if it makes sense for the current situation and settings. This is the reasonable default choice.
  • Password will not be changed for this system.
  • Password capability is not supported for this system. As the result, password will not be changed for this system.

You can adjust the password propagation settings by clicking on the icons and thus fine-tune how the password change is propagated to each individual system.

ChangePasswordPanel.helpPopupTitle=Password propagation help PageBase.button.tooltip.clearSearch=Clear mainForm.uploadTooLarge = Upload must be less than ${maxSize}. diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_en.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_en.properties index 7f83325901e..fd3af60815b 100644 --- a/gui/admin-gui/src/main/resources/localization/Midpoint_en.properties +++ b/gui/admin-gui/src/main/resources/localization/Midpoint_en.properties @@ -1300,7 +1300,7 @@ PageRepositoryQuery.objectType=Object type: PageRepositoryQuery.checkBox.distinct=Distinct PageRepositoryQuery.hibernateQuery=Hibernate query PageRepositoryQuery.hibernateParameters=Query parameters -PageRepositoryQuery.hibernateParametersNote=Note: The parameters are shown here only to indicate how midPoint query is translated into hibernate query. They are not used when manually executing a hibernate query, so the query you enter here should contain no references to parameters. +PageRepositoryQuery.hibernateParametersNote=Note: The parameters are shown here only to indicate how {0} query is translated into hibernate query. They are not used when manually executing a hibernate query, so the query you enter here should contain no references to parameters. PageRepositoryQuery.incompleteResultsNote=Because you do not have administrator rights, results shown here were probably filtered by applying additional search conditions derived from your authorizations. These additional conditions are not visible in the hibernate query shown above. PageRepositoryQuery.chooseSample=Or use a sample: PageRepositoryQuery.sample.ObjectType_AllObjectsInAnOrg=All objects in an organization (directly) @@ -1318,7 +1318,7 @@ PageRepositoryQuery.sample.UserType_UsersThatHaveARole=Users that have active as PageRepositoryQuery.sample.UserType_SpecifiedCostCenters=Users in cost centers 100000-999999 or X100-X999 PageRepositoryQuery.sample.ShadowType_ShadowsOnGivenResource=Shadows on a given resource PageRepositoryQuery.sample.UserType_UsersWithShadowOnGivenResource=Users with linked shadow on a given resource -PageRepositoryQuery.queryVsFilterNote=Note: midPoint query contains a filter along with paging instruction, wrapped together within the <query> element. In contrast, when used in "Advanced filter" in GUI, only the <filter> sub-element is applicable. Paging is managed by the GUI itself. +PageRepositoryQuery.queryVsFilterNote=Note: {0} query contains a filter along with paging instruction, wrapped together within the <query> element. In contrast, when used in "Advanced filter" in GUI, only the <filter> sub-element is applicable. Paging is managed by the GUI itself. PageCert.ago={0} ago PageCertCampaign.basic=Basic PageCertCampaign.button.back=Back @@ -2882,8 +2882,8 @@ RunReportPopupPanel.title=Report configuration before run runUntilNodeDown.error1=Compatible data for 'Thread stop action' are: Close, Suspend runUntilNodeDown.error2=Compatible data for 'Thread stop action' are: Restart, Reschedule SchemaHandlingStep.activation.tooltip.fetchStrategy=How to fetch the attribute when it is needed. Implicit: the attribute is returned by default, it does not need to be requested; Explicit: the attribute is not returned by default, always request it explicitly. -SchemaHandlingStep.activation.tooltip.inbound=Inbound mappings map values from the resource (usually an account) to the Identity Manager (usually a user). -SchemaHandlingStep.activation.tooltip.outbound=Outbound mappings map values from Identity Manager (usually a user) to the resource (usually an account). +SchemaHandlingStep.activation.tooltip.inbound=Inbound mappings map values from the resource (usually an account) to the {0} (usually a user). +SchemaHandlingStep.activation.tooltip.outbound=Outbound mappings map values from {0} (usually a user) to the resource (usually an account). SchemaHandlingStep.association.label.associationName=Association name SchemaHandlingStep.association.label.associationNamespace=Namespace SchemaHandlingStep.association.tooltip.associationAttribute=Name of the attribute that "holds" the association. I.e. an attribute which contains the identifier of the associated object. This is usually an attribute such as "member", "groups", "roles", etc. In subject-to-object associations this is an attribute of a subject (e.g. account attribute "groups"). In object-to-subject associations this is an attribute of an object (e.g. group attribute "members"). @@ -2977,7 +2977,7 @@ SchemaHandlingStep.tooltip.default=If set to true then this definition is the de SchemaHandlingStep.tooltip.dependency=Dependencies are object types that has to be processed before this object types is processed. I.e. this object type depends on them. The object types on which this object type depends will be provisioned before this object type. Dependencies are used to impose ordering into provisioning operations. SchemaHandlingStep.tooltip.filterClause=TODO: SchemaHandlingStep.tooltip.filterClause SchemaHandlingStep.tooltip.intent=Intent specifies what system should do with the object. Intent sorts objects of the same kind into several categories. Objects with different intents may be handled differently by system. -SchemaHandlingStep.tooltip.iteration=Iteratively find values for unique attributes such as identifiers. Identity Manager will try several times to find a unique value for such attributes. +SchemaHandlingStep.tooltip.iteration=Iteratively find values for unique attributes such as identifiers. {0} will try several times to find a unique value for such attributes. SchemaHandlingStep.tooltip.kind=Kind specified what this object is, whether it is account, entitlement or something else. SchemaHandlingStep.tooltip.objectClass=Object class from the schema that will be used to construct instances of this object type. SchemaHandlingStep.tooltip.protected=Specification of protected instances of this object type. System can see protected instances but they cannot be touched. Any attempt to modify them will fail. This is used to protect emergency administration accounts such as "root" or "administrator". @@ -3095,8 +3095,8 @@ SynchronizationReactionEditor.label.objectTemplateRef=Object template ref. SynchronizationReactionEditor.label.reconcile=Reconcile SynchronizationReactionEditor.label.situation=Situation SynchronizationReactionEditor.label.synchronize=Synchronize -SynchronizationStep.action.tooltip.handlerUri=The explicit action to execute. Please note that most actions are designed to work with the default Identity Manager's synchronization algorithm and that this algorithm will be executed unless it was explicitly disabled (and then the result may be an error). Also note that even if no explicit action is selected system will still do the default synchronization algorithm if the "synchronize" option was selected. -SynchronizationStep.action.tooltip.order=Whether the explicit action is executed before Identity Manager's default synchronization algorithms or after them. Most built-in actions are designed to be executed before system synchronization as they only set up the model context and then they let system to do the real work. However some custom action may need to be executed after the synchronization, e.g. to deliver notifications, clean up, etc. +SynchronizationStep.action.tooltip.handlerUri=The explicit action to execute. Please note that most actions are designed to work with the default {0}'s synchronization algorithm and that this algorithm will be executed unless it was explicitly disabled (and then the result may be an error). Also note that even if no explicit action is selected system will still do the default synchronization algorithm if the "synchronize" option was selected. +SynchronizationStep.action.tooltip.order=Whether the explicit action is executed before {0}'s default synchronization algorithms or after them. Most built-in actions are designed to be executed before system synchronization as they only set up the model context and then they let system to do the real work. However some custom action may need to be executed after the synchronization, e.g. to deliver notifications, clean up, etc. SynchronizationStep.button.add=Add synchronization object SynchronizationStep.label.condition=Condition SynchronizationStep.label.confirmation=Confirmation @@ -3478,7 +3478,7 @@ ChangePasswordPanel.legendMessage.selected= - Password will be changed ChangePasswordPanel.legendMessage.propagated= - Automatic password propagation (based on policies defined in resources definitions) ChangePasswordPanel.legendMessage.deselected= - Password will not be changed ChangePasswordPanel.legendMessage.no.password.capability= - Password capability is not supported by resource -ChangePasswordPanel.helpInfo=

This portion of the credentials dialog controls how the password change will be propagated to each individual system. The first line defines whether the password will be changed in the Identity Manager itself. Following lines represent each system for which the password can be changed. The password propagation is controlled by the icons:

  • Password will be changed. Password for this system will be changed to the value specified in the password dialog above.
  • Automatic password propagation. The password might be changed. Whether the password is changed or not depends on the policies set up by identity administrator. This usually means that the password will be changed if it makes sense for the current situation and settings. This is the reasonable default choice.
  • Password will not be changed for this system.
  • Password capability is not supported for this system. As the result, password will not be changed for this system.

You can adjust the password propagation settings by clicking on the icons and thus fine-tune how the password change is propagated to each individual system.

+ChangePasswordPanel.helpInfo=

This portion of the credentials dialog controls how the password change will be propagated to each individual system. The first line defines whether the password will be changed in the {0} itself. Following lines represent each system for which the password can be changed. The password propagation is controlled by the icons:

  • Password will be changed. Password for this system will be changed to the value specified in the password dialog above.
  • Automatic password propagation. The password might be changed. Whether the password is changed or not depends on the policies set up by identity administrator. This usually means that the password will be changed if it makes sense for the current situation and settings. This is the reasonable default choice.
  • Password will not be changed for this system.
  • Password capability is not supported for this system. As the result, password will not be changed for this system.

You can adjust the password propagation settings by clicking on the icons and thus fine-tune how the password change is propagated to each individual system.

ChangePasswordPanel.helpPopupTitle=Password propagation help PageBase.button.tooltip.clearSearch=Clear mainForm.uploadTooLarge = Upload must be less than ${maxSize}.