Skip to content

CAT-1563 Fixed #776

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 3 commits into from
Sep 29, 2016
Merged

CAT-1563 Fixed #776

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c1321d3
CAT-1563 Fixed
Durgesh1988 Sep 28, 2016
36e5acf
CAT-1563 Fixed
Durgesh1988 Sep 29, 2016
1445386
Merge remote-tracking branch 'upstream/dev' into dev
Durgesh1988 Sep 29, 2016
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
19 changes: 18 additions & 1 deletion client/htmls/private/ajax/DesignBlueprint.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -841,6 +841,20 @@ <h4 class="modal-title" id="DockerLaunch">Launch Parameters-Docker Blueprints</h
var $bgList = $('#bgListInputExisting');
var $projectList = $('#projectListInputExisting');
var $envList = $('#envListExisting');
$orgListInput.change(function(e) {
var orgName = $(this).val();
if (orgName == 'choose') {
return;
}
var $selectedOrgOption = $(this).find(":selected");
$bgList.empty();
var getBg = orgBg[orgName];
for (var i = 0; i < getBg.length; i++) {
var $option = $('<option></option>').val(getBg[i].rowid).html(getBg[i].name);
$bgList.append($option);
}
$bgList.trigger('change');
});
$bgList.change(function(e) {
var bgName = $(this).val();
if (bgName == 'choose') {
Expand All @@ -855,6 +869,7 @@ <h4 class="modal-title" id="DockerLaunch">Launch Parameters-Docker Blueprints</h
}
$projectList.trigger('change');
});

var $spinnerProject = $('#spinnerProjectChange').addClass('hidden');
$('#projectListInputExisting').change(function(e) {
var reqBodyNew = {};
Expand All @@ -877,11 +892,13 @@ <h4 class="modal-title" id="DockerLaunch">Launch Parameters-Docker Blueprints</h
});
}); //choose env gets over
var bgProjects = {};
var orgBg ={};
for (var i = 0; i < data.length; i++) {
$orgListInput.append($('<option></option>').val(data[i].rowid).html(data[i].name).data('bglist', data[i].businessGroups).data('envList', data[i].environments));
orgBg[data[i].rowid] = data[i].businessGroups;
for (var j = 0; j < data[i].businessGroups.length; j++) {
var rowid = data[i].businessGroups[j].rowid;
$bgList.append($('<option></option').val(rowid).html(data[i].businessGroups[j].name));
//$bgList.append($('<option></option').val(rowid).html(data[i].businessGroups[j].name));
bgProjects[rowid] = data[i].businessGroups[j].projects;
}
for (var k = 0; k < data[i].environments.length; k++) {
Expand Down
19 changes: 17 additions & 2 deletions client/htmls/private/ajax/DesignBlueprintAzure.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -891,6 +891,20 @@ <h4 class="modal-title">Configure VMs</h4>
var $projectList = $('#projectListInputExisting');
var $envList = $('#envListExisting');
var $projectList = $('#projectListInputExisting');
$orgListInput.change(function(e) {
var orgName = $(this).val();
if (orgName == 'choose') {
return;
}
var $selectedOrgOption = $(this).find(":selected");
$bgList.empty();
var getBg = orgBg[orgName];
for (var i = 0; i < getBg.length; i++) {
var $option = $('<option></option>').val(getBg[i].rowid).html(getBg[i].name);
$bgList.append($option);
}
$bgList.trigger('change');
});
$bgList.change(function(e) {
var bgName = $(this).val();
if (bgName == 'choose') {
Expand Down Expand Up @@ -927,12 +941,13 @@ <h4 class="modal-title">Configure VMs</h4>
});
}); //choose env gets over
var bgProjects = {};
var orgBg ={};
for (var i = 0; i < data.length; i++) {
console.log(data[i].businessGroups);
$orgListInput.append($('<option></option>').val(data[i].rowid).html(data[i].name).data('bglist', data[i].businessGroups).data('envList', data[i].environments));
orgBg[data[i].rowid] = data[i].businessGroups;
for (var j = 0; j < data[i].businessGroups.length; j++) {
var rowid = data[i].businessGroups[j].rowid;
$bgList.append($('<option></option').val(rowid).html(data[i].businessGroups[j].name));
// $bgList.append($('<option></option').val(rowid).html(data[i].businessGroups[j].name));
bgProjects[rowid] = data[i].businessGroups[j].projects;
}
for (var k = 0; k < data[i].environments.length; k++) {
Expand Down
18 changes: 17 additions & 1 deletion client/htmls/private/ajax/DesignBlueprintVmware.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -769,6 +769,20 @@ <h4 class="modal-title" id="DockerLaunch">Launch Parameters-Docker Blueprints</h
var $projectList = $('#projectListInputExisting');
var $envList = $('#envListExisting');
var $projectList = $('#projectListInputExisting');
$orgListInput.change(function(e) {
var orgName = $(this).val();
if (orgName == 'choose') {
return;
}
var $selectedOrgOption = $(this).find(":selected");
$bgList.empty();
var getBg = orgBg[orgName];
for (var i = 0; i < getBg.length; i++) {
var $option = $('<option></option>').val(getBg[i].rowid).html(getBg[i].name);
$bgList.append($option);
}
$bgList.trigger('change');
});
$bgList.change(function(e) {
var bgName = $(this).val();
if (bgName == 'choose') {
Expand Down Expand Up @@ -805,12 +819,14 @@ <h4 class="modal-title" id="DockerLaunch">Launch Parameters-Docker Blueprints</h
});
}); //choose env gets over
var bgProjects = {};
var orgBg ={};
for (var i = 0; i < data.length; i++) {
console.log(data[i].businessGroups);
$orgListInput.append($('<option></option>').val(data[i].rowid).html(data[i].name).data('bglist', data[i].businessGroups).data('envList', data[i].environments));
orgBg[data[i].rowid] = data[i].businessGroups;
for (var j = 0; j < data[i].businessGroups.length; j++) {
var rowid = data[i].businessGroups[j].rowid;
$bgList.append($('<option></option').val(rowid).html(data[i].businessGroups[j].name));
// $bgList.append($('<option></option').val(rowid).html(data[i].businessGroups[j].name));
bgProjects[rowid] = data[i].businessGroups[j].projects;
}
for (var k = 0; k < data[i].environments.length; k++) {
Expand Down
40 changes: 37 additions & 3 deletions client/htmls/private/js/blueprintCommon.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,36 @@ function getTreeDetails(){
var $projectListforcopy = $('#projectListInputExistingforcopy');
var $envListforcopy = $('#envListExistingforcopy');

$orgListInput.change(function(e) {
var orgName = $(this).val();
if (orgName == 'choose') {
return;
}
var $selectedOrgOption = $(this).find(":selected");
$bgList.empty();
var getBg = orgBg[orgName];
for (var i = 0; i < getBg.length; i++) {
var $option = $('<option></option>').val(getBg[i].rowid).html(getBg[i].name);
$bgList.append($option);
}
$bgList.trigger('change');
});

$orgListInputforcopy.change(function(e) {
var orgName = $(this).val();
if (orgName == 'choose') {
return;
}
var $selectedOrgOption = $(this).find(":selected");
$bgListforcopy.empty();
var getBg = orgBg[orgName];
for (var i = 0; i < getBg.length; i++) {
var $option = $('<option></option>').val(getBg[i].rowid).html(getBg[i].name);
$bgListforcopy.append($option);
}
$bgListforcopy.trigger('change');
});

$bgList.change(function(e) {
var bgName = $(this).val();
if (bgName == 'choose') {
Expand Down Expand Up @@ -76,15 +106,17 @@ function getTreeDetails(){
}); //choose env gets over

var bgProjects = {};
var orgBg ={};
for (var i = 0; i < data.length; i++) {
$orgListInput.append($('<option></option>').val(data[i].rowid).html(data[i].name).data('bglist', data[i].businessGroups).data('envList', data[i].environments));
orgBg[data[i].rowid] = data[i].businessGroups;
for (var j = 0; j < data[i].businessGroups.length; j++) {
var rowid = data[i].businessGroups[j].rowid;
$bgList.append($('<option></option').val(rowid).html(data[i].businessGroups[j].name));
/*$bgList.append($('<option></option').val(rowid).html(data[i].businessGroups[0].name));
//Dropdowns on the copy popup
$bgListforcopy.append($('<option></option').val(rowid).html(data[i].businessGroups[j].name));

$bgListforcopy.append($('<option></option').val(rowid).html(data[i].businessGroups[0].name));

orgBg[data[i].rowid] = data[i].businessGroups;*/
bgProjects[rowid] = data[i].businessGroups[j].projects;
}
for (var k = 0; k < data[i].environments.length; k++) {
Expand All @@ -94,6 +126,8 @@ function getTreeDetails(){
//Dropdowns on the copy popup
$orgListInputforcopy.append($('<option></option>').val(data[i].rowid).html(data[i].name).data('bglist', data[i].businessGroups).data('envList', data[i].environments));
}
$orgListInput.trigger('change');
$orgListInputforcopy.trigger('change');
$bgList.trigger('change');
$bgListforcopy.trigger('change');
$('.chooseOrgSelectExisting').change(function(e) {
Expand Down
Loading