Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@mederly
mederly committed Mar 26, 2021
2 parents 0bb9614 + a9d8209 commit c869db2
Show file tree
Hide file tree
Showing 6 changed files with 73 additions and 43 deletions.
9 changes: 5 additions & 4 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/result/MessagePanel.html
View file
Expand Up @@ -9,14 +9,15 @@
<wicket:panel>
<div class="feedback-message box box-solid" wicket:id="detailsBox">
<div class="box-header">
<i class="icon fa " wicket:id="iconType"></i>
<b class="box-title" wicket:id="message">
</b>
<div class="box-tools pull-right">
<div wicket:id="close" data-widget="remove" class="btn btn-box-tool">
<div wicket:id="close" data-widget="remove" class="btn btn-box-tool">
<i class="fa fa-times"/>
</div>
</div>
<div style="display: flex;">
<i class="icon fa " wicket:id="iconType"/>
<b class="box-title" wicket:id="message"/>
</div>
</div>

</div>
Expand Down
4 changes: 2 additions & 2 deletions ...ava/com/evolveum/midpoint/web/component/dialog/ChooseFocusTypeAndRelationDialogPanel.html
View file
Expand Up @@ -8,7 +8,7 @@

<wicket:panel xmlns:wicket="http://wicket.apache.org">
<div>

<div wicket:id="warningFeedback" align="center"/>
<div class="form-group" style="display: -webkit-box;">
<div class="col-md-12" wicket:id="type"/>
</div>
Expand All @@ -19,7 +19,7 @@
</label>
<div class="col-md-8" wicket:id="relation" style="font-weight: normal;"/>
</div>
<div wicket:id="warningMessage" align="center"/>
<div wicket:id="infoMessage" align="center"/>
<p align="right" class="form-group">
<a class="btn btn-primary btn-sm" wicket:id="cancel" />
<a class="btn btn-primary btn-sm" wicket:id="ok" />
Expand Down
17 changes: 15 additions & 2 deletions ...ava/com/evolveum/midpoint/web/component/dialog/ChooseFocusTypeAndRelationDialogPanel.java
View file
Expand Up @@ -10,11 +10,14 @@

import javax.xml.namespace.QName;

import com.evolveum.midpoint.gui.api.component.result.MessagePanel;
import com.evolveum.midpoint.web.component.message.FeedbackAlerts;
import com.evolveum.midpoint.web.component.util.VisibleBehaviour;

import org.apache.commons.collections4.CollectionUtils;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.feedback.FeedbackMessages;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.IModel;
Expand All @@ -37,7 +40,8 @@ public class ChooseFocusTypeAndRelationDialogPanel extends BasePanel implements
private static final String ID_RELATION = "relation";
private static final String ID_BUTTON_OK = "ok";
private static final String ID_CANCEL_OK = "cancel";
private static final String ID_WARNING_MESSAGE = "warningMessage";
private static final String ID_INFO_MESSAGE = "infoMessage";
private static final String ID_WARNING_FEEDBACK = "warningFeedback";
private static final String ID_RELATION_REQUIRED = "relationRequired";

private IModel<String> messageModel = null;
Expand All @@ -58,6 +62,11 @@ protected void onInitialize() {
}

private void initLayout(){
MessagePanel warningMessage = new MessagePanel(ID_WARNING_FEEDBACK, MessagePanel.MessagePanelType.WARN, getWarningMessageModel());
warningMessage.setOutputMarkupId(true);
warningMessage.add(new VisibleBehaviour(() -> getWarningMessageModel() != null));
add(warningMessage);

DropDownFormGroup<QName> type = new DropDownFormGroup<QName>(ID_OBJECT_TYPE, Model.of(getDefaultObjectType()), Model.ofList(getSupportedObjectTypes()),
new QNameObjectTypeChoiceRenderer(), createStringResource("chooseFocusTypeAndRelationDialogPanel.type"),
"chooseFocusTypeAndRelationDialogPanel.tooltip.type", true, "col-md-4", "col-md-8", true);
Expand All @@ -80,7 +89,7 @@ private void initLayout(){
relationRequired.add(new VisibleBehaviour((() -> isRelationRequired())));
add(relationRequired);

Label label = new Label(ID_WARNING_MESSAGE, messageModel);
Label label = new Label(ID_INFO_MESSAGE, messageModel);
label.add(new VisibleBehaviour(() -> messageModel != null && messageModel.getObject() != null));
add(label);

Expand Down Expand Up @@ -115,6 +124,10 @@ public void onClick(AjaxRequestTarget target) {

}

protected IModel<String> getWarningMessageModel() {
return null;
}

private boolean isRelationRequired() {
return true;
}
Expand Down
16 changes: 8 additions & 8 deletions ...n-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogDetails.html
View file
Expand Up @@ -119,14 +119,14 @@
<div wicket:id="delta"></div>
</div>
</div>
<div class="col-md-12">
<div class="box" style="border-top: none; display: inline-block;">
<h3 style="font-size: 18px; display: inline-block; line-height: 1; margin: 0; padding: 10px; border-top: none;">
<span><wicket:message key="PageAuditLogDetails.auditLogsSameTaskId"/></span>
</h3>
<div wicket:id="historyPanel" class="col-md-12" />
</div>
</div>
<!-- <div class="col-md-12">-->
<!-- <div class="box" style="border-top: none; display: inline-block;">-->
<!-- <h3 style="font-size: 18px; display: inline-block; line-height: 1; margin: 0; padding: 10px; border-top: none;">-->
<!-- <span><wicket:message key="PageAuditLogDetails.auditLogsSameTaskId"/></span>-->
<!-- </h3>-->
<!-- <div wicket:id="historyPanel" class="col-md-12" />-->
<!-- </div>-->
<!-- </div>-->
</div>
<div class="row">
<div class="main-button-bar" style="padding-left: 15px;">
Expand Down
54 changes: 27 additions & 27 deletions ...n-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogDetails.java
View file
Expand Up @@ -116,7 +116,7 @@ public class PageAuditLogDetails extends PageBase {
private static final String ID_ADDITIONAL_ITEM_LINE = "additionalItemLine";
private static final String ID_ITEM_NAME = "itemName";
private static final String ID_ITEM_VALUE = "itemValue";
private static final String ID_HISTORY_PANEL = "historyPanel";
// private static final String ID_HISTORY_PANEL = "historyPanel";

private static final String ID_BUTTON_BACK = "back";
private static final int TASK_EVENTS_TABLE_SIZE = 10;
Expand Down Expand Up @@ -202,37 +202,37 @@ private void initLayout() {
WebMarkupContainer eventPanel = new WebMarkupContainer(ID_EVENT_PANEL);
eventPanel.setOutputMarkupId(true);
add(eventPanel);
initAuditLogHistoryPanel(eventPanel);
// initAuditLogHistoryPanel(eventPanel);
initEventPanel(eventPanel);
initDeltasPanel(eventPanel);
initLayoutBackButton();
}

private void initAuditLogHistoryPanel(WebMarkupContainer eventPanel) {

AuditLogViewerPanel panel = new AuditLogViewerPanel(ID_HISTORY_PANEL) {
private static final long serialVersionUID = 1L;

@Override
protected ObjectQuery getCustomizeContentQuery(){
return getPageBase().getPrismContext().queryFor(AuditEventRecordType.class)
.item(AuditEventRecordType.F_TASK_IDENTIFIER)
.eq(recordModel.getObject().getTaskIdentifier())
.build();
}

@Override
protected String getAuditStorageKey(String collectionNameValue) {
if (StringUtils.isNotEmpty(collectionNameValue)) {
return SessionStorage.KEY_EVENT_DETAIL_AUDIT_LOG + "." + collectionNameValue;
}
return SessionStorage.KEY_EVENT_DETAIL_AUDIT_LOG;
}
};
panel.setOutputMarkupId(true);
panel.add(new VisibleBehaviour(() -> recordModel.getObject() != null && recordModel.getObject().getTaskIdentifier() != null));
eventPanel.addOrReplace(panel);
}
// private void initAuditLogHistoryPanel(WebMarkupContainer eventPanel) {
//
// AuditLogViewerPanel panel = new AuditLogViewerPanel(ID_HISTORY_PANEL) {
// private static final long serialVersionUID = 1L;
//
// @Override
// protected ObjectQuery getCustomizeContentQuery(){
// return getPageBase().getPrismContext().queryFor(AuditEventRecordType.class)
// .item(AuditEventRecordType.F_TASK_IDENTIFIER)
// .eq(recordModel.getObject().getTaskIdentifier())
// .build();
// }
//
// @Override
// protected String getAuditStorageKey(String collectionNameValue) {
// if (StringUtils.isNotEmpty(collectionNameValue)) {
// return SessionStorage.KEY_EVENT_DETAIL_AUDIT_LOG + "." + collectionNameValue;
// }
// return SessionStorage.KEY_EVENT_DETAIL_AUDIT_LOG;
// }
// };
// panel.setOutputMarkupId(true);
// panel.add(new VisibleBehaviour(() -> recordModel.getObject() != null && recordModel.getObject().getTaskIdentifier() != null));
// eventPanel.addOrReplace(panel);
// }

private void initEventPanel(WebMarkupContainer eventPanel) {

Expand Down
16 changes: 16 additions & 0 deletions ...gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/AbstractRoleMemberPanel.java
View file
Expand Up @@ -1233,6 +1233,22 @@ protected QName getDefaultObjectType() {
return WebComponentUtil.classToQName(AbstractRoleMemberPanel.this.getPrismContext(),
AbstractRoleMemberPanel.this.getDefaultObjectType());
}

@Override
protected IModel<String> getWarningMessageModel() {
if (SearchBoxScopeType.SUBTREE.equals(getMemberPanelStorage().getOrgSearchScope())) {
return getPageBase().createStringResource("abstractRoleMemberPanel.unassign.warning.subtree");
}
return null;
}

@Override
public int getHeight() {
if (SearchBoxScopeType.SUBTREE.equals(getMemberPanelStorage().getOrgSearchScope())) {
return 325;
}
return 230;
}
};

getPageBase().showMainPopup(chooseTypePopupContent, target);
Expand Down

0 comments on commit c869db2

Please sign in to comment.