[Engine-patches] Change in ovirt-engine[master]: webadmin: Fixed display of changeability prohibition reasons

[lvernia]

Lior Vernia has uploaded a new change for review.

Change subject: webadmin: Fixed display of changeability prohibition reasons
......................................................................

webadmin: Fixed display of changeability prohibition reasons

These were set after the changeability was set, so they have probably
never been actually displayed. This comes as a preparation to a patch
that would render the order of setting changeability and prohibition
reason impertinent.

Change-Id: I685595a685e0ba4ff98f73002dda13085fc04f46
Signed-off-by: Lior Vernia <lver...@redhat.com>
---
M 
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/MoveOrCopyDiskModel.java
M 
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RunOnceModel.java
2 files changed, 6 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/63/16463/1

diff --git 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/MoveOrCopyDiskModel.java
 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/MoveOrCopyDiskModel.java
index 82931bb..6903233 100644
--- 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/MoveOrCopyDiskModel.java
+++ 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/MoveOrCopyDiskModel.java
@@ -180,13 +180,13 @@
     }
 
     private void updateChangeability(DiskModel disk, boolean 
isDiskBasedOnTemplate, boolean noSources, boolean noTargets) {
-        disk.getStorageDomain().setIsChangable(!noTargets);
-        disk.getSourceStorageDomain().setIsChangable(!noSources);
-        disk.getSourceStorageDomainName().setIsChangable(!noSources);
         
disk.getStorageDomain().setChangeProhibitionReason(isDiskBasedOnTemplate ?
                 constants.noActiveStorageDomainWithTemplateMsg() : 
getNoActiveTargetDomainMessage());
         
disk.getSourceStorageDomain().setChangeProhibitionReason(getNoActiveSourceDomainMessage());
         
disk.getSourceStorageDomainName().setChangeProhibitionReason(getNoActiveSourceDomainMessage());
+        disk.getStorageDomain().setIsChangable(!noTargets);
+        disk.getSourceStorageDomain().setIsChangable(!noSources);
+        disk.getSourceStorageDomainName().setIsChangable(!noSources);
     }
 
     private void addSourceStorageDomainName(DiskModel disk, 
ArrayList<StorageDomain> sourceStorageDomains) {
diff --git 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RunOnceModel.java
 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RunOnceModel.java
index a59c54e..0682e31 100644
--- 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RunOnceModel.java
+++ 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RunOnceModel.java
@@ -647,22 +647,22 @@
                      ArrayList<Disk> vmDisks = (ArrayList<Disk>) 
((VdcQueryReturnValue) returnValue).getReturnValue();
 
                      if (vmDisks.isEmpty()) {
-                         getRunAsStateless().setIsChangable(false);
                          getRunAsStateless()
                                 
.setChangeProhibitionReason(ConstantsManager.getInstance()
                                         .getMessages()
                                         .disklessVmCannotRunAsStateless());
+                         getRunAsStateless().setIsChangable(false);
                          getRunAsStateless().setEntity(false);
                      }
 
                      if (!isDisksContainBootableDisk(vmDisks))
                      {
                          BootSequenceModel bootSequenceModel = 
getBootSequence();
-                         
bootSequenceModel.getHardDiskOption().setIsChangable(false);
                          bootSequenceModel.getHardDiskOption()
                                  
.setChangeProhibitionReason(ConstantsManager.getInstance()
                                          .getMessages()
                                          
.bootableDiskIsRequiredToBootFromDisk());
+                         
bootSequenceModel.getHardDiskOption().setIsChangable(false);
                      }
                  }
              }));
@@ -689,11 +689,11 @@
                      if (!hasNics)
                      {
                          BootSequenceModel bootSequenceModel = 
getBootSequence();
-                         
bootSequenceModel.getNetworkOption().setIsChangable(false);
                          bootSequenceModel.getNetworkOption()
                                  
.setChangeProhibitionReason(ConstantsManager.getInstance()
                                          .getMessages()
                                          
.interfaceIsRequiredToBootFromNetwork());
+                         
bootSequenceModel.getNetworkOption().setIsChangable(false);
                      }
                  }
              }));


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

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