Skip to content

CAT-2368/CAT-2370/CAT-2374/CAT-2376 Fixed #768

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 28, 2016
Merged

CAT-2368/CAT-2370/CAT-2374/CAT-2376 Fixed #768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions client/htmls/private/ajax/Settings/bgWizard.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
});
}

Expand Down
2 changes: 1 addition & 1 deletion client/htmls/private/ajax/Settings/projWizard.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
});
Expand Down
2 changes: 1 addition & 1 deletion client/htmls/private/ajax/Settings/providerWizard.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
2 changes: 1 addition & 1 deletion client/htmls/private/ajax/Settings/settingsWizard.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion server/install.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down