From 9ef1730c97a794c5d97f1189b3bf5dabc0ac4b3b Mon Sep 17 00:00:00 2001
From: Brian Federle <brian.federle@citrix.com>
Date: Mon, 20 Aug 2012 11:07:06 -0700
Subject: [PATCH] CS-16044: Zone wizard: Add 'use local storage' checkbox

Add checkbox to zone wizard indicating whether zone will use local
storage. If checked, bypass add primary storage step and enable local
storage for zone on creation.
---
 .../classes/resources/messages.properties     |  1 +
 ui/index.jsp                                  |  1 +
 ui/scripts/zoneWizard.js                      | 38 ++++++-------------
 3 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index 04112567a75..2b612db9288 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -1,4 +1,5 @@
 #new labels (begin) **********************************************************************************************
+label.local.storage.enabled=Local storage enabled
 label.tier.details=Tier details
 label.edit.tags=Edit tags
 label.network.rate.megabytes=Network Rate (MB/s)
diff --git a/ui/index.jsp b/ui/index.jsp
index a7e30c32e77..7c0840fb408 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -1602,6 +1602,7 @@
 </html>
 <script language="javascript">
 dictionary = {
+'label.local.storage.enabled': '<fmt:message key="label.local.storage.enabled"/>',
 'label.tier.details': '<fmt:message key="label.tier.details"/>',
 'label.edit.tags': '<fmt:message key="label.edit.tags"/>',
 'label.network.rate.megabytes': '<fmt:message key="label.network.rate.megabytes"/>',
diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js
index e7d8fa77d91..3170e0d0719 100644
--- a/ui/scripts/zoneWizard.js
+++ b/ui/scripts/zoneWizard.js
@@ -283,31 +283,8 @@
         return (args.groupedData.zone.hypervisor != "VMware");
       },
 						
-			addPrimaryStorage: function(args) {		
-			  var item;
-				$.ajax({
-				  url: createURL("listConfigurations&name=" + todb("use.local.storage")),
-					dataType: 'json',
-					async: false,
-					success: function(json) {					  
-					  var items = json.listconfigurationsresponse.configuration; //unfortunately, it returns 2 items("system.vm.use.local.storage", "use.local.storage") instead of 1 item. 						
-						if(items != null && items.length > 0) { 
-						  for(var i = 0; i < items.length; i++) {
-							  item = items[i];
-							  if(item.name == "use.local.storage") {								  
-								  break; //break for loop
-								}
-							}
-						}
-					}
-				});		
-
-				if(item == null || item.value == null || item.value.length == 0 || item.value == "false")
-				  configurationUseLocalStorage = false;
-				else				
-          configurationUseLocalStorage = true;
-					
-				return (!configurationUseLocalStorage);
+			addPrimaryStorage: function(args) {
+        return args.data.localstorageenabled != 'on';
       }	
     },
 
@@ -512,6 +489,10 @@
                 }
               });
             }
+          },
+          localstorageenabled: {
+            label: 'label.local.storage.enabled',
+            isBoolean: true
           }
         }
       },
@@ -1259,6 +1240,9 @@
 
           array1.push("&name=" + todb(args.data.zone.name));
 
+          if (args.data.zone.localstorageenabled == 'on') {
+            array1.push("&localstorageenabled=true");
+          }
           array1.push("&dns1=" + todb(args.data.zone.dns1));
 
           var dns2 = args.data.zone.dns2;
@@ -2798,8 +2782,8 @@
           });
         },
 
-        addPrimaryStorage: function(args) {     
-					if(configurationUseLocalStorage == true) { //use local storage, don't need primary storage. So, skip this step.
+        addPrimaryStorage: function(args) {
+					if(args.data.zone.localstorageenabled == 'on') { //use local storage, don't need primary storage. So, skip this step.
             stepFns.addSecondaryStorage({
               data: args.data
             });