Alexey Chub has uploaded a new change for review. Change subject: webadmin: Show additional columns for events ......................................................................
webadmin: Show additional columns for events Change-Id: I6b1b7d36e992002d1b66aa1525e97619c067ab3e Signed-off-by: Alexey Chub <[email protected]> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/events/EventListModelTable.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/events/EventListModel.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabEventView.java 5 files changed, 61 insertions(+), 15 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/15/10315/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java index 6bb9018..ffca6dc 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java @@ -544,6 +544,12 @@ @DefaultStringValue("Correlation Id") String correltaionIdEvent(); + @DefaultStringValue("Origin") + String originEvent(); + + @DefaultStringValue("Custom Event Id") + String customEventIdEvent(); + @DefaultStringValue("Until") String untilEndTime(); diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/events/EventListModelTable.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/events/EventListModelTable.java index 6a1b6ec..4ec68bd 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/events/EventListModelTable.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/events/EventListModelTable.java @@ -55,6 +55,24 @@ } }; getTable().addColumn(correlationIdColumn, constants.correltaionIdEvent(), "100px"); //$NON-NLS-1$ + + TextColumnWithTooltip<AuditLog> originColumn = new TextColumnWithTooltip<AuditLog>() { + @Override + public String getValue(AuditLog object) { + return object.getOrigin(); + } + }; + getTable().addColumn(originColumn, constants.originEvent(), "100px"); //$NON-NLS-1$ + + TextColumnWithTooltip<AuditLog> customEventIdColumn = new TextColumnWithTooltip<AuditLog>() { + @Override + public String getValue(AuditLog object) { + + int id = object.getCustomEventId(); + return id >= 0 ? String.valueOf(id) : ""; //$NON-NLS-1$ + } + }; + getTable().addColumn(customEventIdColumn, constants.customEventIdEvent(), "100px"); //$NON-NLS-1$ } } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/events/EventListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/events/EventListModel.java index 565b140..7ffd380 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/events/EventListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/events/EventListModel.java @@ -146,35 +146,30 @@ protected void refreshModel() { - AsyncQuery _asyncQuery = new AsyncQuery(); - _asyncQuery.setModel(this); - _asyncQuery.asyncCallback = new INewAsyncCallback() { + AsyncQuery query = new AsyncQuery(this, new INewAsyncCallback() { @Override - public void OnSuccess(Object model, Object ReturnValue) - { + public void OnSuccess(Object model, Object returnValue) { EventListModel eventListModel = (EventListModel) model; - ArrayList<AuditLog> list = - (ArrayList<AuditLog>) ((VdcQueryReturnValue) ReturnValue).getReturnValue(); + ArrayList<AuditLog> list = (ArrayList<AuditLog>) ((VdcQueryReturnValue) returnValue).getReturnValue(); requestingData = false; for (AuditLog auditLog : list) { // in case the corr_id is created in client, // remove unnecessary data (leave only the corr_id). if (auditLog.getCorrelationId() != null - && auditLog.getCorrelationId().startsWith(TaskListModel._WEBADMIN_)) { + && auditLog.getCorrelationId().startsWith(TaskListModel._WEBADMIN_)) { auditLog.setCorrelationId(auditLog.getCorrelationId().split("_")[2]); //$NON-NLS-1$ } } eventListModel.UpdateItems(list); } - }; + }); - SearchParameters tempVar = new SearchParameters(getSearchString(), SearchType.AuditLog); - tempVar.setMaxCount(getSearchPageSize()); - tempVar.setSearchFrom(getLastEvent() != null ? getLastEvent().getaudit_log_id() : 0); - tempVar.setRefresh(false); - SearchParameters searchParameters = tempVar; + SearchParameters params = new SearchParameters(getSearchString(), SearchType.AuditLog); + params.setMaxCount(getSearchPageSize()); + params.setSearchFrom(getLastEvent() != null ? getLastEvent().getaudit_log_id() : 0); + params.setRefresh(false); - Frontend.RunQuery(VdcQueryType.Search, searchParameters, _asyncQuery); + Frontend.RunQuery(VdcQueryType.Search, params, query); } @Override diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java index c9befd5..21a26a6 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java @@ -1761,6 +1761,12 @@ @DefaultStringValue("Correlation Id") String eventCorrelationId(); + @DefaultStringValue("Origin") + String eventOrigin(); + + @DefaultStringValue("Custom Event Id") + String eventCustomEventId(); + // Host configure local storage @DefaultStringValue("Data Center") String dcLocalStorage(); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabEventView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabEventView.java index 8624580..8a9d03c 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabEventView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabEventView.java @@ -94,6 +94,12 @@ getTable().ensureColumnPresent(AdvancedViewColumns.corrIdColumn, constants.eventCorrelationId(), advancedViewEnabled, "100px"); //$NON-NLS-1$ + getTable().ensureColumnPresent(AdvancedViewColumns.originColumn, constants.eventOrigin(), + advancedViewEnabled, + "100px"); //$NON-NLS-1$ + getTable().ensureColumnPresent(AdvancedViewColumns.customEventIdColumn, constants.eventCustomEventId(), + advancedViewEnabled, + "100px"); //$NON-NLS-1$ } void initTable() { @@ -192,4 +198,19 @@ } }; + public static final TextColumnWithTooltip<AuditLog> originColumn = new TextColumnWithTooltip<AuditLog>() { + @Override + public String getValue(AuditLog object) { + return object.getOrigin(); + } + }; + + public static final TextColumnWithTooltip<AuditLog> customEventIdColumn = new TextColumnWithTooltip<AuditLog>() { + @Override + public String getValue(AuditLog object) { + + int id = object.getCustomEventId(); + return id >= 0 ? String.valueOf(id) : ""; //$NON-NLS-1$ + } + }; } -- To view, visit http://gerrit.ovirt.org/10315 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6b1b7d36e992002d1b66aa1525e97619c067ab3e Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alexey Chub <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
