ofri masad has uploaded a new change for review.
Change subject: webadmin: Move enums to localized file
......................................................................
webadmin: Move enums to localized file
The MigrationSupport enums ware located in the wrong file and so could
not be localized.
Moved the enums to the correct file
Deleted redundant method from UnitVmModel
Change-Id: I87edacf6b3aa2180f1e8721b8f342ca04a648e3f
Signed-off-by: Ofri Masad <oma...@redhat.com>
---
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/TemplateVmModelBehavior.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java
M
frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Enums.java
M
frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/LocalizedEnums.java
M
frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/Enums.properties
M
frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties
7 files changed, 11 insertions(+), 15 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/08/12808/1
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/TemplateVmModelBehavior.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/TemplateVmModelBehavior.java
index 669457f..447f0e5 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/TemplateVmModelBehavior.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/TemplateVmModelBehavior.java
@@ -53,7 +53,7 @@
template.getstorage_pool_id().getValue());
}
- getModel().setMigrationMode(template.getMigrationSupport());
+
getModel().getMigrationMode().setSelectedItem(template.getMigrationSupport());
}
@Override
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java
index 48e8e51..52b03de 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java
@@ -1755,10 +1755,6 @@
}
}
- public void setMigrationMode(MigrationSupport value) {
- getMigrationMode().setSelectedItem(value);
- }
-
public void SetDataCenter(UnitVmModel model, ArrayList<storage_pool> list)
{
if (model.getBehavior().getSystemTreeSelectedItem() != null
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java
index 55e9ae8..fef95d6 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java
@@ -932,6 +932,6 @@
}
protected void updateHostPinning(MigrationSupport migrationSupport) {
- getModel().setMigrationMode(migrationSupport);
+ getModel().getMigrationMode().setSelectedItem(migrationSupport);
}
}
diff --git
a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Enums.java
b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Enums.java
index 78684d8..3337242 100644
---
a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Enums.java
+++
b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Enums.java
@@ -357,10 +357,4 @@
String ServiceType___NFS();
String ServiceType___SHD();
-
- String MigrationSupport___MIGRATABLE();
-
- String MigrationSupport___IMPLICITLY_NON_MIGRATABLE();
-
- String MigrationSupport___PINNED_TO_HOST();
}
diff --git
a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/LocalizedEnums.java
b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/LocalizedEnums.java
index 9d3e8a2..b430d66 100644
---
a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/LocalizedEnums.java
+++
b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/LocalizedEnums.java
@@ -626,4 +626,10 @@
String AuditLogType___VDS_HIGH_SWAP_USE();
String AuditLogType___VDS_LOW_SWAP();
+
+ String MigrationSupport___MIGRATABLE();
+
+ String MigrationSupport___IMPLICITLY_NON_MIGRATABLE();
+
+ String MigrationSupport___PINNED_TO_HOST();
}
diff --git
a/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/Enums.properties
b/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/Enums.properties
index 80c3ed4..375a8e0 100644
---
a/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/Enums.properties
+++
b/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/Enums.properties
@@ -177,6 +177,3 @@
JobExecutionStatus___FAILED=Failed
JobExecutionStatus___ABORTED=Aborted
JobExecutionStatus___UNKNOWN=Unknown
-MigrationSupport___MIGRATABLE=Allow manual and automatic migration
-MigrationSupport___IMPLICITLY_NON_MIGRATABLE=Allow manual migration only
-MigrationSupport___PINNED_TO_HOST=Do not allow migration
diff --git
a/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties
b/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties
index dad1bff..d92f953 100644
---
a/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties
+++
b/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties
@@ -310,3 +310,6 @@
AuditLogType___VDS_HIGH_CPU_USE=Host cpu usage exceeded defined threshold
AuditLogType___VDS_HIGH_SWAP_USE=Host swap memory usage exceeded defined
threshold
AuditLogType___VDS_LOW_SWAP=Host free swap memory is under defined threshold
+MigrationSupport___MIGRATABLE=Allow manual and automatic migration
+MigrationSupport___IMPLICITLY_NON_MIGRATABLE=Allow manual migration only
+MigrationSupport___PINNED_TO_HOST=Do not allow migration
--
To view, visit http://gerrit.ovirt.org/12808
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I87edacf6b3aa2180f1e8721b8f342ca04a648e3f
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: ofri masad <oma...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
