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 Dec 1, 2016
2 parents d572e1e + d6b85ad commit 72cebf5
Show file tree
Hide file tree
Showing 10 changed files with 114 additions and 82 deletions.
2 changes: 1 addition & 1 deletion config/sql/_all/oracle-upgrade-3.4-3.5.sql
View file
Expand Up @@ -38,7 +38,7 @@ REFERENCES m_audit_event;

-- Quartz

ALTER TABLE qrtz_fired_triggers ADD COLUMN SCHED_TIME NUMBER(13) NOT NULL;
ALTER TABLE qrtz_fired_triggers ADD SCHED_TIME NUMBER(13) NOT NULL;

-- Activiti

Expand Down
2 changes: 1 addition & 1 deletion .../src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentDetailsPanel.java
View file
Expand Up @@ -20,7 +20,7 @@ public AssignmentDetailsPanel(String id, IModel<AssignmentEditorDto> model) {

private void initLayout() {
setOutputMarkupId(true);
ShoppingKartEditorPanel assignmentDetailsPanel = new ShoppingKartEditorPanel(ID_DETAILS_PANEL, getModel());
ShoppingCartEditorPanel assignmentDetailsPanel = new ShoppingCartEditorPanel(ID_DETAILS_PANEL, getModel());
assignmentDetailsPanel.setOutputMarkupId(true);
add(assignmentDetailsPanel);

Expand Down
6 changes: 3 additions & 3 deletions ...t/assignment/ShoppingKartEditorPanel.html → ...t/assignment/ShoppingCartEditorPanel.html
View file
Expand Up @@ -18,13 +18,13 @@
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
<div class="box-header with-border" wicket:id="headerRow">
<div wicket:id="shoppingKartDetailsBox" class="info-box">
<div wicket:id="shoppingKartIconBox" class="info-box-icon"><span class="user-thumbnail-helper"/><span wicket:id="shoppingKartIcon"/></div>
<div wicket:id="shoppingCartDetailsBox" class="info-box">
<div wicket:id="shoppingCartIconBox" class="info-box-icon"><span class="user-thumbnail-helper"/><span wicket:id="shoppingCartIcon"/></div>
<div class="info-box-content">
<span class="summary-content-box">
<span class="summary-text-box">
<span class="info-box-number">
<span class="summary-panel-display-name" wicket:id="shoppingKartDisplayName"/>
<span class="summary-panel-display-name" wicket:id="shoppingCartDisplayName"/>
</span>
<span wicket:id="description" class="summary-panel-title">
</span>
Expand Down
13 changes: 7 additions & 6 deletions ...t/assignment/ShoppingKartEditorPanel.java → ...t/assignment/ShoppingCartEditorPanel.java
View file
Expand Up @@ -26,18 +26,19 @@
/**
* Created by honchar.
*/
public class ShoppingKartEditorPanel extends AssignmentEditorPanel {
public class ShoppingCartEditorPanel extends AssignmentEditorPanel {
private static final long serialVersionUID = 1L;

protected static final String ID_BOX = "shoppingKartDetailsBox";
protected static final String ID_BOX = "shoppingCartDetailsBox";
protected static final String ID_DESCRIPTION = "description";
protected static final String ID_ICON_BOX = "shoppingKartIconBox";
protected static final String ID_ICON = "shoppingKartIcon";
protected static final String ID_DISPLAY_NAME = "shoppingKartDisplayName";
protected static final String ID_ICON_BOX = "shoppingCartIconBox";
protected static final String ID_ICON = "shoppingCartIcon";
protected static final String ID_DISPLAY_NAME = "shoppingCartDisplayName";
protected static final String BOX_CSS_CLASS = "info-box";
protected static final String ICON_BOX_CSS_CLASS = "info-box-icon";


public ShoppingKartEditorPanel(String id, IModel<AssignmentEditorDto> model) {
public ShoppingCartEditorPanel(String id, IModel<AssignmentEditorDto> model) {
super(id, model);
}

Expand Down
73 changes: 46 additions & 27 deletions ...main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.html
View file
Expand Up @@ -23,34 +23,53 @@
<span wicket:id="feedback" class="text-danger"/>
</div>
<div wicket:id="parametersPanel" class="box-body">
<div class="col-md-6">
<label><wicket:message key="PageAuditLogViewer.fromLabel" /></label>
<div wicket:id="fromField"/>
<label><wicket:message key="PageAuditLogViewer.toLabel" /></label>
<div wicket:id="toField" />
<label wicket:id="targetNameLabel"></label>
<div wicket:id="targetNameField" />
<label wicket:id="targetOwnerNameLabel"></label>
<div wicket:id="targetOwnerNameField" />
<label><wicket:message key="PageAuditLogViewer.initiatorNameLabel" /></label>
<div wicket:id="initiatorNameField"/>
<label><wicket:message key="PageAuditLogViewer.changedItem" /></label>
<div wicket:id="changedItem"/>
<div class="col-md-6 form-horizontal">
<div class="form-group">
<label class="col-sm-3 control-label"><wicket:message key="PageAuditLogViewer.fromLabel" /></label>
<div class="col-sm-9" wicket:id="fromField"/>
</div>
<div class="form-group">
<label class="col-sm-3 control-label"><wicket:message key="PageAuditLogViewer.toLabel" /></label>
<div class="col-sm-9" wicket:id="toField" />
</div>
<div class="form-group" wicket:id="targetName">
<label class="col-sm-3 control-label"><wicket:message key="PageAuditLogViewer.targetNameLabel" /></label>
<div class="col-sm-9" wicket:id="targetNameField" />
</div>
<div class="form-group" wicket:id="targetOwnerName">
<label class="col-sm-3 control-label"><wicket:message key="PageAuditLogViewer.targetOwnerNameLabel" /></label>
<div class="col-sm-9" wicket:id="targetOwnerNameField" />
</div>
<div class="form-group">
<label class="col-sm-3 control-label"><wicket:message key="PageAuditLogViewer.initiatorNameLabel" /></label>
<div class="col-sm-9" wicket:id="initiatorNameField"/>
</div>
<div class="form-group">
<label class="col-sm-3 control-label"><wicket:message key="PageAuditLogViewer.changedItem" /></label>
<div class="col-sm-9" wicket:id="changedItem"/>
</div>
</div>
<div class="col-md-6" style="padding-left: 5px;">
<label><wicket:message key="PageAuditLogViewer.eventTypeLabel" /></label>
<div wicket:id="eventTypeField" />
<label wicket:id="eventStageLabel" />
<div wicket:id="eventStageField" />
<label><wicket:message key="PageAuditLogViewer.outcomeLabel" /></label>
<div wicket:id="outcomeField" />
<!--</div>-->
<!--<div class="col-md-4" style="padding-left: 5px;">-->
<label><wicket:message key="PageAuditLogViewer.channelLabel" /></label>
<div wicket:id="channelField" />

<label><wicket:message key="PageAuditLogViewer.hostIdentifierLabel" /></label>
<div wicket:id="hostIdentifierField" />
<div class="col-md-6 form-horizontal">
<div class="form-group">
<label class="col-sm-3 control-label"><wicket:message key="PageAuditLogViewer.eventTypeLabel" /></label>
<div class="col-sm-9" wicket:id="eventTypeField" />
</div>
<div class="form-group" wicket:id="eventStage">
<label class="col-sm-3 control-label"><wicket:message key="PageAuditLogViewer.eventStageLabel" /></label>
<div class="col-sm-9" wicket:id="eventStageField" />
</div>
<div class="form-group">
<label class="col-sm-3 control-label"><wicket:message key="PageAuditLogViewer.outcomeLabel" /></label>
<div class="col-sm-9" wicket:id="outcomeField" />
</div>
<div class="form-group">
<label class="col-sm-3 control-label"><wicket:message key="PageAuditLogViewer.channelLabel" /></label>
<div class="col-sm-9" wicket:id="channelField" />
</div>
<div class="form-group">
<label class="col-sm-3 control-label"><wicket:message key="PageAuditLogViewer.hostIdentifierLabel" /></label>
<div class="col-sm-9" wicket:id="hostIdentifierField" />
</div>
<span class="btn-group" style="float:right; padding-top: 5px;"><a class="btn btn-primary" wicket:id="searchButton"/></span>
</div>
</div>
Expand Down
82 changes: 45 additions & 37 deletions ...main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.java
View file
Expand Up @@ -66,15 +66,15 @@ public class AuditLogViewerPanel extends BasePanel{
private static final String ID_FROM = "fromField";
private static final String ID_TO = "toField";
private static final String ID_INITIATOR_NAME = "initiatorNameField";
private static final String ID_TARGET_NAME = "targetNameField";
private static final String ID_TARGET_NAME_LABEL = "targetNameLabel";
private static final String ID_TARGET_OWNER_NAME_LABEL = "targetOwnerNameLabel";
private static final String ID_TARGET_OWNER_NAME = "targetOwnerNameField";
private static final String ID_TARGET_NAME_FIELD = "targetNameField";
private static final String ID_TARGET_NAME = "targetName";
private static final String ID_TARGET_OWNER_NAME = "targetOwnerName";
private static final String ID_TARGET_OWNER_NAME_FIELD = "targetOwnerNameField";
private static final String ID_CHANNEL = "channelField";
private static final String ID_HOST_IDENTIFIER = "hostIdentifierField";
private static final String ID_EVENT_TYPE = "eventTypeField";
private static final String ID_EVENT_STAGE = "eventStageField";
private static final String ID_EVENT_STAGE_LABEL = "eventStageLabel";
private static final String ID_EVENT_STAGE_FIELD = "eventStageField";
private static final String ID_EVENT_STAGE = "eventStage";
private static final String ID_OUTCOME = "outcomeField";
private static final String ID_CHANGED_ITEM = "changedItem";

Expand Down Expand Up @@ -200,35 +200,37 @@ private void initParametersPanel(Form mainForm) {
eventType.setOutputMarkupId(true);
parametersPanel.add(eventType);

Label eventStageLabel = new Label(ID_EVENT_STAGE_LABEL, pageBase.createStringResource("PageAuditLogViewer.eventStageLabel"));
eventStageLabel.add(new VisibleEnableBehaviour(){
WebMarkupContainer eventStage = new WebMarkupContainer(ID_EVENT_STAGE);
eventStage.add(new VisibleEnableBehaviour() {
private static final long serialVersionUID = 1L;
@Override
public boolean isVisible(){
return visibilityMap == null || visibilityMap.get(EVENT_STAGE_LABEL_VISIBILITY) == null ?
true : visibilityMap.get(EVENT_STAGE_LABEL_VISIBILITY);
public boolean isVisible(){
return visibilityMap == null || visibilityMap.get(EVENT_STAGE_LABEL_VISIBILITY) == null ?
true : visibilityMap.get(EVENT_STAGE_LABEL_VISIBILITY);
}
});
eventStageLabel.setOutputMarkupId(true);
parametersPanel.add(eventStageLabel);
eventStage.setOutputMarkupId(true);
parametersPanel.add(eventStage);

ListModel<AuditEventStageType> eventStageListModel = new ListModel<AuditEventStageType>(
Arrays.asList(AuditEventStageType.values()));
PropertyModel<AuditEventStageType> eventStageModel = new PropertyModel<AuditEventStageType>(
auditSearchDto, AuditSearchDto.F_EVENT_STAGE);
DropDownChoicePanel<AuditEventStageType> eventStage = new DropDownChoicePanel<AuditEventStageType>(
ID_EVENT_STAGE, eventStageModel, eventStageListModel,
DropDownChoicePanel<AuditEventStageType> eventStageField = new DropDownChoicePanel<AuditEventStageType>(
ID_EVENT_STAGE_FIELD, eventStageModel, eventStageListModel,
new EnumChoiceRenderer<AuditEventStageType>(), true);
eventStage.add(new VisibleEnableBehaviour() {
@Override
eventStageField.add(new VisibleEnableBehaviour() {
private static final long serialVersionUID = 1L;
@Override
public boolean isVisible() {
return visibilityMap == null || visibilityMap.get(EVENT_STAGE_FIELD_VISIBILITY) == null ?
true : visibilityMap.get(EVENT_STAGE_FIELD_VISIBILITY);
}
});
eventStage.getBaseFormComponent().add(new EmptyOnChangeAjaxFormUpdatingBehavior());
eventStage.getBaseFormComponent().add(new EmptyOnBlurAjaxFormUpdatingBehaviour());
eventStage.setOutputMarkupId(true);
parametersPanel.add(eventStage);
eventStageField.getBaseFormComponent().add(new EmptyOnChangeAjaxFormUpdatingBehavior());
eventStageField.getBaseFormComponent().add(new EmptyOnBlurAjaxFormUpdatingBehaviour());
eventStageField.setOutputMarkupId(true);
eventStage.add(eventStageField);

ListModel<OperationResultStatusType> outcomeListModel = new ListModel<OperationResultStatusType>(
Arrays.asList(OperationResultStatusType.values()));
Expand Down Expand Up @@ -267,7 +269,7 @@ public boolean isVisible() {
ID_INITIATOR_NAME,
new PropertyModel<ObjectReferenceType>(auditSearchDto, AuditSearchDto.F_INITIATOR_NAME),
allowedClasses) {

private static final long serialVersionUID = 1L;
@Override
protected void replaceIfEmpty(ObjectType object) {
ObjectReferenceType ort = ObjectTypeUtil.createObjectRef(object);
Expand All @@ -277,66 +279,72 @@ protected void replaceIfEmpty(ObjectType object) {
};
parametersPanel.add(chooseInitiatorPanel);

Label targetOwnerNameLabel = new Label(ID_TARGET_OWNER_NAME_LABEL, pageBase.createStringResource("PageAuditLogViewer.targetOwnerNameLabel"));
targetOwnerNameLabel.add(new VisibleEnableBehaviour(){
WebMarkupContainer targetOwnerName = new WebMarkupContainer(ID_TARGET_OWNER_NAME);
targetOwnerName.add(new VisibleEnableBehaviour() {
private static final long serialVersionUID = 1L;
@Override
public boolean isVisible(){
return visibilityMap == null || visibilityMap.get(TARGET_OWNER_LABEL_VISIBILITY) == null ?
true : visibilityMap.get(TARGET_OWNER_LABEL_VISIBILITY);
}
});
parametersPanel.add(targetOwnerNameLabel);
parametersPanel.add(targetOwnerName);

ValueChooseWrapperPanel<ObjectReferenceType, UserType> chooseTargerOwnerPanel = new ValueChooseWrapperPanel<ObjectReferenceType, UserType>(
ID_TARGET_OWNER_NAME,
ID_TARGET_OWNER_NAME_FIELD,
new PropertyModel<ObjectReferenceType>(auditSearchDto, AuditSearchDto.F_TARGET_OWNER_NAME),
allowedClasses) {
private static final long serialVersionUID = 1L;
@Override
protected void replaceIfEmpty(ObjectType object) {
ObjectReferenceType ort = ObjectTypeUtil.createObjectRef(object);
ort.setTargetName(object.getName());
getModel().setObject(ort);
}
};
chooseTargerOwnerPanel.add(new VisibleEnableBehaviour(){
@Override
chooseTargerOwnerPanel.add(new VisibleEnableBehaviour() {
private static final long serialVersionUID = 1L;
@Override
public boolean isVisible(){
return visibilityMap == null || visibilityMap.get(TARGET_OWNER_FIELD_VISIBILITY) == null ?
true : visibilityMap.get(TARGET_OWNER_FIELD_VISIBILITY);
}
});
parametersPanel.add(chooseTargerOwnerPanel);

Label targetNameLabel = new Label(ID_TARGET_NAME_LABEL, pageBase.createStringResource("PageAuditLogViewer.targetNameLabel"));
targetNameLabel.add(new VisibleEnableBehaviour(){
targetOwnerName.add(chooseTargerOwnerPanel);

WebMarkupContainer targetName = new WebMarkupContainer(ID_TARGET_NAME);
targetName.add(new VisibleEnableBehaviour() {
private static final long serialVersionUID = 1L;
@Override
public boolean isVisible(){
return visibilityMap == null || visibilityMap.get(TARGET_NAME_LABEL_VISIBILITY) == null ?
true : visibilityMap.get(TARGET_NAME_LABEL_VISIBILITY);
}
});
parametersPanel.add(targetNameLabel);
parametersPanel.add(targetName);
Collection<Class<? extends ObjectType>> allowedClassesAll = new ArrayList<>();
allowedClassesAll.addAll(ObjectTypes.getAllObjectTypes());
ValueChooseWrapperPanel<ObjectReferenceType, ObjectType> chooseTargetPanel = new ValueChooseWrapperPanel<ObjectReferenceType, ObjectType>(
ID_TARGET_NAME,
ID_TARGET_NAME_FIELD,
new PropertyModel<ObjectReferenceType>(auditSearchDto, AuditSearchDto.F_TARGET_NAME),
allowedClassesAll){
allowedClassesAll) {
private static final long serialVersionUID = 1L;
@Override
protected void replaceIfEmpty(ObjectType object) {
ObjectReferenceType ort = ObjectTypeUtil.createObjectRef(object);
ort.setTargetName(object.getName());
getModel().setObject(ort);
}
};
chooseTargetPanel.add(new VisibleEnableBehaviour(){
chooseTargetPanel.add(new VisibleEnableBehaviour() {
private static final long serialVersionUID = 1L;
@Override
public boolean isVisible(){
return visibilityMap == null || visibilityMap.get(TARGET_NAME_FIELD_VISIBILITY) == null ?
true : visibilityMap.get(TARGET_NAME_FIELD_VISIBILITY);
}
});
parametersPanel.add(chooseTargetPanel);
targetName.add(chooseTargetPanel);

AjaxSubmitButton ajaxButton = new AjaxSubmitButton(ID_SEARCH_BUTTON,
createStringResource("BasicSearchPanel.search")) {
Expand Down
6 changes: 3 additions & 3 deletions gui/admin-gui/src/main/resources/localization/Midpoint.properties
View file
Expand Up @@ -3372,12 +3372,12 @@ PageAuditLogViewer.menuName=Audit Log Viewer
PageAuditLogViewer.timeLabel=Time
PageAuditLogViewer.fromLabel=From
PageAuditLogViewer.toLabel=To
PageAuditLogViewer.initiatorNameLabel=Initiator name
PageAuditLogViewer.initiatorNameLabel=Initiator
PageAuditLogViewer.channelLabel=Channel
PageAuditLogViewer.hostIdentifierLabel=Host Identifier
PageAuditLogViewer.targetNameLabel=Target Name
PageAuditLogViewer.targetNameLabel=Target
PageAuditLogViewer.targetTypeLabel=Target Type
PageAuditLogViewer.targetOwnerNameLabel=Target Owner Name
PageAuditLogViewer.targetOwnerNameLabel=Target Owner
PageAuditLogViewer.eventTypeLabel=Event Type
PageAuditLogViewer.eventTypeShortLabel=Type
PageAuditLogViewer.eventStageLabel=Event Stage
Expand Down
6 changes: 3 additions & 3 deletions gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
View file
Expand Up @@ -3326,12 +3326,12 @@ PageAuditLogViewer.menuName=Audit Log Viewer
PageAuditLogViewer.timeLabel=Time
PageAuditLogViewer.fromLabel=From
PageAuditLogViewer.toLabel=To
PageAuditLogViewer.initiatorNameLabel=Initiator name
PageAuditLogViewer.initiatorNameLabel=Initiator
PageAuditLogViewer.channelLabel=Channel
PageAuditLogViewer.hostIdentifierLabel=Host Identifier
PageAuditLogViewer.targetNameLabel=Target Name
PageAuditLogViewer.targetNameLabel=Target
PageAuditLogViewer.targetTypeLabel=Target Type
PageAuditLogViewer.targetOwnerNameLabel=Target Owner Name
PageAuditLogViewer.targetOwnerNameLabel=Target Owner
PageAuditLogViewer.eventTypeLabel=Event Type
PageAuditLogViewer.eventTypeShortLabel=Type
PageAuditLogViewer.eventStageLabel=Event Stage
Expand Down

0 comments on commit 72cebf5

Please sign in to comment.