From e4b2353b0d65faa1bd9d8c66ff545cee6ee629e3 Mon Sep 17 00:00:00 2001
From: Durgesh1988 <durgeshch@gmail.com>
Date: Wed, 28 Sep 2016 15:00:32 +0530
Subject: [PATCH] CAT-2368/CAT-2370/CAT-2374/CAT-2376 Fixed

---
 client/htmls/private/ajax/Settings/bgWizard.html       | 1 +
 client/htmls/private/ajax/Settings/projWizard.html     | 2 +-
 client/htmls/private/ajax/Settings/providerWizard.html | 2 +-
 client/htmls/private/ajax/Settings/settingsWizard.html | 2 +-
 server/install.js                                      | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/client/htmls/private/ajax/Settings/bgWizard.html b/client/htmls/private/ajax/Settings/bgWizard.html
index 163580448..86bb7870e 100644
--- a/client/htmls/private/ajax/Settings/bgWizard.html
+++ b/client/htmls/private/ajax/Settings/bgWizard.html
@@ -52,6 +52,7 @@ <h4 class="widget-margin" style="color:black;">Create Business Group</h4>
             $('#orgDropdown option:last').attr('selected', 'selected')
             var $optionSelect = $('<option></option').val(orgNameForSetup).attr('rowid', orgIdForSetup).html(orgNameForSetup);
             $('#orgname').append($optionSelect);
+            getBgValues();
         });
     }
 
diff --git a/client/htmls/private/ajax/Settings/projWizard.html b/client/htmls/private/ajax/Settings/projWizard.html
index 9dddc3bfc..fdfa8073b 100644
--- a/client/htmls/private/ajax/Settings/projWizard.html
+++ b/client/htmls/private/ajax/Settings/projWizard.html
@@ -93,7 +93,7 @@ <h4 class="widget-margin" style="color:black;">Create Project</h4>
             return false;
         }
     } else {
-        toastr.error('invalid valid form submitted'); // for demo
+        toastr.error('invalid form submitted'); // for demo
     }
     return false; // for demo
 });
diff --git a/client/htmls/private/ajax/Settings/providerWizard.html b/client/htmls/private/ajax/Settings/providerWizard.html
index a9b40f146..b2e9633ef 100644
--- a/client/htmls/private/ajax/Settings/providerWizard.html
+++ b/client/htmls/private/ajax/Settings/providerWizard.html
@@ -347,7 +347,7 @@ <h4 class="widget-margin" style="color:black;">Create Providers</h4>
                    if (data.currentStep.nestedSteps) {
                        var nestedSteps = data.currentStep.nestedSteps;
                        if (nestedSteps[0].name === 'Provider' && nestedSteps[0].isCompleted === true &&
-                            nestedSteps[1].name === 'VMImage' && nestedSteps[1].isCompleted === false) {
+                            nestedSteps[1].name === 'VMImages' && nestedSteps[1].isCompleted === false) {
                            $('.btn-2 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
                             $('.btn-3 a').removeClass('not-activeAnchor');
                            $('.contentSetting').find('ol li#imageCreate').addClass('active');
diff --git a/client/htmls/private/ajax/Settings/settingsWizard.html b/client/htmls/private/ajax/Settings/settingsWizard.html
index 51703ecef..0f8916825 100644
--- a/client/htmls/private/ajax/Settings/settingsWizard.html
+++ b/client/htmls/private/ajax/Settings/settingsWizard.html
@@ -19,7 +19,7 @@ <h4 class="widget-margin" style="color:black;">Create Organization</h4>
                         </div>
                         <div class="col-lg-6 col-md-6">
                            <label for="name">Domain Name:</label>
-                           <input name="ctl00$MainContent$domainname" value="" id="domainname" class="form-control" type="text" maxlength="35">
+                           <input name="domainname" value="" id="domainname"  class="form-control" type="text"  cdata="catalyst" maxlength="35">
                         </div>
                         <div class="col-lg-6 col-md-6 margintop15">
                            <label for="name">Planned Cost:</label>
diff --git a/server/install.js b/server/install.js
index e751e1951..70b3be400 100755
--- a/server/install.js
+++ b/server/install.js
@@ -71,7 +71,7 @@ function getDefaultsConfig() {
             {name :'Org Configuration',isCompleted:false,mandatoryCheck:true,nestedSteps:[{name:'Organization',isCompleted:false,mandatoryCheck:true},
                 {name :'BusinessGroup',isCompleted:false,mandatoryCheck:true},{name:'Project',isCompleted:false,mandatoryCheck:true}]},
             {name :'Config Management',isCompleted:false,mandatoryCheck:true,nestedSteps:[{name:'ChefServer',isCompleted:false,mandatoryCheck:true},{name:'Environment',isCompleted:false,mandatoryCheck:true},{name:'Teams',isCompleted:false,mandatoryCheck:true}]},
-            {name :'Provider Configuration',isCompleted:false,mandatoryCheck:true,nestedSteps:[{name:'Provider',isCompleted:false,mandatoryCheck:true},{name:'VMImage',isCompleted:false,mandatoryCheck:true}]},
+            {name :'Provider Configuration',isCompleted:false,mandatoryCheck:true,nestedSteps:[{name:'Provider',isCompleted:false,mandatoryCheck:true},{name:'VMImages',isCompleted:false,mandatoryCheck:true}]},
             {name :'Gallery Setup',isCompleted:false,mandatoryCheck:false,nestedSteps:[{name:'Templates',isCompleted:false,mandatoryCheck:false},{name:'ServiceCommand',isCompleted:false,mandatoryCheck:false},{name:'ScriptGallery',isCompleted:false,mandatoryCheck:false}]},
             {name :'Devops Roles',isCompleted:false,mandatoryCheck:false,nestedSteps:[{name:'Nexus',isCompleted:false,mandatoryCheck:false},{name:'Docker',isCompleted:false,mandatoryCheck:false},{name:'Jenkins',isCompleted:false,mandatoryCheck:false}]},
             {name :'CMDB Configuration',isCompleted:false,mandatoryCheck:false}