ui: fixes for domain, zone selection in create disk offering

Fixes missing labels. Decouples zone selection with 'Public' check in create disk offering form.

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

Author: shwstppr

ui/l10n/en.js

@@ -705,6 +705,7 @@ var dictionary = {
 "label.dns.1":"DNS 1",
 "label.dns.2":"DNS 2",
 "label.domain":"Domain",
+"label.domains":"Domains",
 "label.domain.admin":"Domain Admin",
 "label.domain.details":"Domain details",
 "label.domain.id":"Domain ID",

ui/scripts/configuration.js

@@ -2032,8 +2032,6 @@
                                         label: 'label.zone',
                                         docID: 'helpDiskOfferingZone',
                                         isMultiple: true,
-                                        isHidden: true,
-                                        dependsOn: 'isPublic',
                                         validation: {
                                             allzonesonly: true
                                         },
@@ -2147,16 +2145,7 @@
                                 if (args.data.isPublic != "on") {
                                     var domains = "";
                                     if (Object.prototype.toString.call(args.data.domain) === '[object Array]') {
-                                        var rootDomainSelected = false;
-                                        args.data.domain.forEach(function (domain) {
-                                            if (domain === null) {
-                                                rootDomainSelected = true;
-                                                break;
-                                            }
-                                        });
-                                        if(!rootDomainSelected) {
-                                            domains = args.data.domain.join(",");
-                                        }
+                                        domains = args.data.domain.join(",");
                                     } else {
                                         if (args.data.domain != null) {
                                             domains = args.data.domain;
@@ -2167,30 +2156,30 @@
                                             domainids: domains
                                         });
                                     }
+                                }
 
-                                    var zones = "";
-                                    if (Object.prototype.toString.call(args.data.zone) === '[object Array]') {
-                                        var allZonesSelected = false;
-                                        args.data.zone.forEach(function (zone) {
-                                            if (zone === null) {
-                                                allZonesSelected = true;
-                                                break;
-                                            }
-                                        });
-                                        if(!allZonesSelected) {
-                                            zones = args.data.zone.join(",");
-                                        }
-                                    } else {
-                                        if (args.data.zone != null) {
-                                            zones = args.data.zone;
+                                var zones = "";
+                                if (Object.prototype.toString.call(args.data.zone) === '[object Array]') {
+                                    var allZonesSelected = false;
+                                    args.data.zone.forEach(function (zone) {
+                                        if (zone === null) {
+                                            allZonesSelected = true;
+                                            break;
                                         }
+                                    });
+                                    if(!allZonesSelected) {
+                                        zones = args.data.zone.join(",");
                                     }
-                                    if (zones != "") {
-                                        $.extend(data, {
-                                            zoneids: zones
-                                        });
+                                } else {
+                                    if (args.data.zone != null) {
+                                        zones = args.data.zone;
                                     }
                                 }
+                                if (zones != "") {
+                                    $.extend(data, {
+                                        zoneids: zones
+                                    });
+                                }
 
                                 $.ajax({
                                     url: createURL('createDiskOffering'),

ui/scripts/docs.js

@@ -383,7 +383,7 @@ cloudStack.docs = {
         externalLink: ''
     },
     helpDiskOfferingDomain: {
-        desc: 'Select the subdomain in which this offering is available',
+        desc: 'Select the domains in which this offering is available (Tip: Use Ctrl to choose multiple domains)',
         externalLink: ''
     },
     helpDiskOfferingZone: {

ui/scripts/storage.js

@@ -173,7 +173,7 @@
         });
     }
 
-    var selectedDiskOfferingObj = null;
+    var diskOfferingsObjList, selectedDiskOfferingObj = null;
 
     cloudStack.sections.storage = {
         title: 'label.storage',
@@ -279,13 +279,29 @@
                                                     });
                                                 }
                                             });
+                                            args.$select.change(function() {
+                                                var diskOfferingSelect = $(this).closest('form').find('select[name=diskOffering]');
+                                                if(diskOfferingSelect) {
+                                                    $(diskOfferingSelect).find('option').remove().end();
+                                                    var data = {
+                                                        zoneid: $(this).val(),
+                                                    };
+                                                    console.log(data);
+                                                    var diskOfferings = cloudStack.listDiskOfferings({ data: data });
+                                                    diskOfferingsObjList = diskOfferings;
+                                                    $(diskOfferings).each(function() {
+                                                        $(diskOfferingSelect).append(new Option(this.displaytext, this.id));
+                                                    });
+                                                }
+                                            });
                                         }
                                     },
                                     diskOffering: {
                                         label: 'label.disk.offering',
                                         docID: 'helpVolumeDiskOffering',
                                         select: function(args) {
                                             var diskOfferings = cloudStack.listDiskOfferings({});
+                                            diskOfferingsObjList = diskOfferings;
                                             var items = [];
                                             $(diskOfferings).each(function() {
                                                 items.push({
@@ -298,7 +314,7 @@
                                             });
                                             args.$select.change(function() {
                                                 var diskOfferingId = $(this).val();
-                                                $(diskOfferings).each(function() {
+                                                $(diskOfferingsObjList).each(function() {
                                                     if (this.id == diskOfferingId) {
                                                         selectedDiskOfferingObj = this;
                                                         return false; //break the $.each() loop