[Engine-patches] Change in ovirt-engine[master]: webadmin: cannot import & clone with suffix

[gchaplik]

Gilad Chaplik has uploaded a new change for review.

Change subject: webadmin: cannot import & clone with suffix
......................................................................

webadmin: cannot import & clone with suffix

When importing and cloning, choosing apply to all (suffix),
resulted in stcuk flow (the OK button doesn't work)

Change-Id: I835b51c420fedd06cd13b4769084eca6d492cfcd
Signed-off-by: Gilad Chaplik <gchap...@redhat.com>
---
M 
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/TemplateBackupModel.java
M 
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/VmBackupModel.java
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/03/7903/1

diff --git 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/TemplateBackupModel.java
 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/TemplateBackupModel.java
index 658fb10..db2ef60 100644
--- 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/TemplateBackupModel.java
+++ 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/TemplateBackupModel.java
@@ -139,7 +139,7 @@
     protected boolean validateSuffix(String suffix, EntityModel entityModel) {
         for (Object object : objectsInSetupMap.values()) {
             VmTemplate template = (VmTemplate) object;
-            if (!validateName(template.getname() + suffix, template.getos(), 
entityModel)) {
+            if (!validateName(template.getname() + suffix, template, 
entityModel)) {
                 return false;
             }
         }
diff --git 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/VmBackupModel.java
 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/VmBackupModel.java
index b97f318..7b50e5c 100644
--- 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/VmBackupModel.java
+++ 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/VmBackupModel.java
@@ -286,7 +286,7 @@
     protected boolean validateSuffix(String suffix, EntityModel entityModel) {
         for (Object object : objectsInSetupMap.values()) {
             VM vm = (VM) object;
-            if (!validateName(vm.getvm_name() + suffix, vm.getos(), 
entityModel)) {
+            if (!validateName(vm.getvm_name() + suffix, vm, entityModel)) {
                 return false;
             }
         }


--
To view, visit http://gerrit.ovirt.org/7903
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I835b51c420fedd06cd13b4769084eca6d492cfcd
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Gilad Chaplik <gchap...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches