From 10e70bcb9c1ff5c1aa09172dfc6be5c83fde242d Mon Sep 17 00:00:00 2001
From: Brian Federle <brian.federle@citrix.com>
Date: Mon, 9 Jul 2012 14:54:15 -0700
Subject: [PATCH 1/3] CS-15392: Add error handling to edit user action

Original patch by: Olga Smola <olya.smola@gmail.com>
Reviewed by: Brian Federle <brian.federle@citrix.com>
---
 ui/scripts/accounts.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ui/scripts/accounts.js b/ui/scripts/accounts.js
index 382510e849a..6692f855a66 100644
--- a/ui/scripts/accounts.js
+++ b/ui/scripts/accounts.js
@@ -804,6 +804,9 @@
                     success: function(json) {
                       var item = json.updateuserresponse.user;
                       args.response.success({data:item});
+                    },
+                    error: function(data) {
+                      args.response.error(parseXMLHttpResponse(data));
                     }
                   });
 

From ccf2851ca6037f2562f70dc1412cb106abad8168 Mon Sep 17 00:00:00 2001
From: Brian Federle <brian.federle@citrix.com>
Date: Mon, 9 Jul 2012 16:40:38 -0700
Subject: [PATCH 2/3] CS-12739: VM wizard: add asterisk next to network 'name'
 field

Original patch by: Pranav Saxena <pranav.saxena@citrix.com>
Reviewed by: Brian Federle <brian.federle@citrix.com>
---
 ui/index.jsp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/index.jsp b/ui/index.jsp
index fb3327f5466..af05f4a652d 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -257,7 +257,7 @@
 
                                 <!-- Name -->
                                 <div class="field name hide-if-unselected">
-                                  <div class="name"><fmt:message key="label.name"/></div>
+                                  <div class="name"> <span class="field-required">*</span> <fmt:message key="label.name"/></div>
                                   <div class="value">
                                     <input type="text" class="required" name="new-network-name" />
                                   </div>

From 29e90f8358a0c4d2efc708a55ae3178bc2f88393 Mon Sep 17 00:00:00 2001
From: Deepti Dohare <deepti.dohare@citrix.com>
Date: Tue, 10 Jul 2012 06:01:02 +0530
Subject: [PATCH 3/3] CS-15429: When an instance is created with data volume,
 account limit for this data volume was not checked against. Adding a check
 for that. Signed-off-by: Nitin Mehta<nitin.mehta@citrix.com>

---
 server/src/com/cloud/vm/UserVmManagerImpl.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java
index b3fac7076f5..635a943f676 100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -2243,8 +2243,9 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager
         }
 
         // check if account/domain is with in resource limits to create a new vm
+        boolean isIso = Storage.ImageFormat.ISO == template.getFormat();
         _resourceLimitMgr.checkResourceLimit(owner, ResourceType.user_vm);
-        _resourceLimitMgr.checkResourceLimit(owner, ResourceType.volume);
+        _resourceLimitMgr.checkResourceLimit(owner, ResourceType.volume, (isIso || diskOfferingId == null ? 1 : 2));
 
         //verify security group ids
         if (securityGroupIdList != null) {
@@ -2274,7 +2275,7 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager
         if (listZoneTemplate == null || listZoneTemplate.isEmpty()) {
             throw new InvalidParameterValueException("The template " + template.getId() + " is not available for use");
         }
-        boolean isIso = Storage.ImageFormat.ISO == template.getFormat();
+
         if (isIso && !template.isBootable()) {
             throw new InvalidParameterValueException("Installing from ISO requires an ISO that is bootable: " + template.getId());
         }