Alexander Wels has uploaded a new change for review. Change subject: engine,userportal,webadmin: Event log->Event list/pane ......................................................................
engine,userportal,webadmin: Event log->Event list/pane - Replaced all user facing instances of Event log with either Event list or Event pane based on if they showed up exclusively in the UI or not. Change-Id: I582ceaa91b934446812dfad77dd86068beed0125 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1162824 Signed-off-by: Alexander Wels <[email protected]> --- M backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties M backend/manager/modules/dal/src/main/resources/bundles/VdsmErrors.properties M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CancelMigrateVDSCommand.java M frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java 5 files changed, 10 insertions(+), 10 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/47/35147/1 diff --git a/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties b/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties index 733ad1f..eb6cc9e 100644 --- a/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties +++ b/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties @@ -873,9 +873,9 @@ DWH_STOPPED=History Service stopped. DWH_STARTED=History Service started. DWH_ERROR=Error in History Service. -USER_REMOVE_AUDIT_LOG=Event log message ${AuditLogId} was removed by User ${UserName}. -USER_REMOVE_AUDIT_LOG_FAILED=User ${UserName} failed to remove event log message ${AuditLogId}. -USER_CLEAR_ALL_DISMISSED_AUDIT_LOG=User ${UserName} had restored all deleted event log messages. +USER_REMOVE_AUDIT_LOG=Event list message ${AuditLogId} was removed by User ${UserName}. +USER_REMOVE_AUDIT_LOG_FAILED=User ${UserName} failed to remove event list message ${AuditLogId}. +USER_CLEAR_ALL_DISMISSED_AUDIT_LOG=User ${UserName} had restored all deleted event list messages. USER_CLEAR_ALL_DISMISSED_AUDIT_LOG_FAILED=User ${UserName} failed to restore all deleted audit log messages. VM_FAILED_TO_PRESTART_IN_POOL=Cannot pre-start VM in pool '${VmPoolName}'. The system will continue trying. USER_ADDED_DISK_PROFILE=Disk Profile ${ProfileName} was successfully added (User: ${UserName}). diff --git a/backend/manager/modules/dal/src/main/resources/bundles/VdsmErrors.properties b/backend/manager/modules/dal/src/main/resources/bundles/VdsmErrors.properties index 30fcdd9..3fb0199 100644 --- a/backend/manager/modules/dal/src/main/resources/bundles/VdsmErrors.properties +++ b/backend/manager/modules/dal/src/main/resources/bundles/VdsmErrors.properties @@ -403,7 +403,7 @@ VM_HOST_CANNOT_LIVE_MERGE=The host on which this VM is running does not support live merging snapshots. MIGRATION_DEST_INVALID_HOSTNAME=Migration destination has an invalid hostname MIGRATION_CANCEL_ERROR=Migration not in progress -MIGRATION_CANCEL_ERROR_NO_VM=Cancel migration has failed. Please try again in a few moments and track the VM's event log for details. +MIGRATION_CANCEL_ERROR_NO_VM=Cancel migration has failed. Please try again in a few moments and track the VM's event list for details. DB=Database error. MAC_POOL_NO_MACS_LEFT=No available MAC addresses left in the MAC Address Pool. MAC_POOL_NOT_INITIALIZED=MAC Address Pool is not defined. Please check your configuration using Configuration Tool. diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java index cd2c16d..d0ac54a 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java @@ -465,7 +465,7 @@ } /** - * check if value is less than configurable threshold , if yes , generated event log message + * check if value is less than configurable threshold , if yes , generated event list message * * @param stat */ @@ -497,7 +497,7 @@ } /** - * check if value is less than configurable threshold , if yes , generated event log message + * check if value is less than configurable threshold , if yes , generated event list message * * @param stat */ @@ -515,7 +515,7 @@ } /** - * check if value is less than configurable threshold , if yes , generated event log message + * check if value is less than configurable threshold , if yes , generated event list message * * @param stat */ @@ -539,7 +539,7 @@ } /** - * check if value is less than configurable threshold , if yes , generated event log message + * check if value is less than configurable threshold , if yes , generated event list message * * @param stat */ diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CancelMigrateVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CancelMigrateVDSCommand.java index 00bc075..180c353 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CancelMigrateVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CancelMigrateVDSCommand.java @@ -30,7 +30,7 @@ switch (returnStatus) { case noVM: VDSExceptionBase outEx = - createDefaultConcreteException("Cancel migration has failed. Please try again in a few moments and track the VM's event log for details"); + createDefaultConcreteException("Cancel migration has failed. Please try again in a few moments and track the VM's event list for details"); initializeVdsError(returnStatus); outEx.setVdsError(new VDSError(VdcBllErrors.MIGRATION_CANCEL_ERROR_NO_VM, getReturnStatus().mMessage)); throw outEx; diff --git a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java index 281c61a..fde7b44 100644 --- a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java +++ b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java @@ -1390,7 +1390,7 @@ @DefaultStringValue("Failed to retrieve existing storage domain information.") String failedToRetrieveExistingStorageDomainInformationMsg(); - @DefaultStringValue("There is no storage domain under the specified path. Check event log for more details.") + @DefaultStringValue("There is no storage domain under the specified path. Check event pane for more details.") String thereIsNoStorageDomainUnderTheSpecifiedPathMsg(); @DefaultStringValue("Importing Storage Domain...") -- To view, visit http://gerrit.ovirt.org/35147 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I582ceaa91b934446812dfad77dd86068beed0125 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alexander Wels <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
