Skip to content

Added Service Delivery check while creating new blueprint. #827

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 5 commits into from
Oct 18, 2016
Merged

Added Service Delivery check while creating new blueprint. #827

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
214a689
Merge remote-tracking branch 'upstream/dev' into dev-divakar
divakarkonakalla Oct 13, 2016
ad9aa98
Merge remote-tracking branch 'upstream/dev' into dev-divakar
divakarkonakalla Oct 17, 2016
9d04ab0
Added Service Delivery check while creating new blueprint.
divakarkonakalla Oct 17, 2016
3e2b4fb
Added check before send bot type & description to API.
divakarkonakalla Oct 17, 2016
f15505e
Added tag server check in chef import, import by ip pages.
divakarkonakalla Oct 18, 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
1 change: 1 addition & 0 deletions ...t/cat3/src/partials/sections/dashboard/workzone/instance/popups/InstanceImportByIpCtrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
reqBody.fqdn = $scope.ipAddress;
reqBody.os = $scope.os;
reqBody.configManagmentId = $scope.selectedConfig;
reqBody.tagServer = $scope.tagServer;
reqBody.credentials = {
username: $scope.username
};
Expand Down
4 changes: 4 additions & 0 deletions client/cat3/src/partials/sections/dashboard/workzone/instance/popups/instanceImportByIp.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,10 @@ <h4 class="modal-title">
</div>
</div>
<a class="pull-right URL-margin" ng-click="appLinkSecondOption=true;" ng-show="!appLinkSecondOption">Add Application URL</a>
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<label class="control-label">Tag imported server : </label>
<input type="checkbox" ng-model="tagServer" ng-true-value="true" ng-false-value="false" class="checkbox-list" />
</div>
</div>
</fieldset>
</div>
Expand Down
41 changes: 40 additions & 1 deletion client/htmls/private/ajax/Aws-Production.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,35 @@ <h4 class="panel-title">
</select>
</div>
</div>
<div>
<div class="col-md-12 col-sm-12 col-xs-12 margintop15">
<label class="control-label">Add to Service Delivery : </label>
<input type="checkbox" id="serviceDeliveryCheck" class="checkbox-list"/>
</div>
<div class="col-md-6 col-sm-6 col-xs-6 sevice-delivery-section">
<label class="control-label">Bot Type
<span class="control-label redSpan">&nbsp;*</span></label>
</label>
<br />
<span class="col-md-12 col-sm-12 col-xs-12 no-padding">
<select name="botType" class="form-control" id="botType">
<option selected="selected" value="Task">Task</option>
<option value="Check">Check</option>
<option value="Learning">Learning</option>
<option value="Composite">Composite</option>
<option value="Built with other">Built with other</option>
</select>
</span>
</div>
<div class="col-lg-6 col-md-6 col-sm-6 col-xs-6 sevice-delivery-section">
<label class="control-label">Short Description
</label>
<br />
<span class="col-md-12 col-sm-12 col-xs-12 no-padding">
<input type="text" id="shortDesc" name="shortDesc" class="form-control" autofocus maxlength="50" />
</span>
</div>
</div>
<!-- <div class="col-lg-6 hidden" style="margin-top:5px;">
<label for="">Assign Users<span style="color:red">*</span></label>
<div class="userListLoadingContainer">
Expand Down Expand Up @@ -1049,4 +1078,14 @@ <h4> Blueprint List:</h4>
</div>
</div>
<!--modal ends here-->
<script type="text/javascript" src="js/dev/awsProduction.js"></script>
<script type="text/javascript" src="js/dev/awsProduction.js"></script>

<style>
.sevice-delivery-section {
display: none;
}

.showservice {
display: block;
}
</style>
12 changes: 12 additions & 0 deletions client/htmls/private/ajax/Settings/chefSync.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,13 @@ <h4 class="modal-title">Import Nodes</h4>
</select>

</div>
<div class="col-lg-6 hidden" style="margin-top:15px;">
<label class="">Assign Users<span class="control-label redSpan">&nbsp;*</span></label>
</div>
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<label class="control-label">Tag imported server : </label>
<input type="checkbox" id="tagServer" class="checkbox-list"/>
</div>
</div>
<div class="modal-footer">
<div class="marginForButtons">
Expand Down Expand Up @@ -498,6 +505,11 @@ <h4 class="modal-title">Importing Nodes</h4>
reqBody.projectId = $projectList.val();
reqBody.orgName = $orgListInput.find('option:selected').text();
reqBody.bgName = $bgList.find('option:selected').text();
if ($('#tagServer').prop("checked")) {
reqBody.tagServer = true;
} else {
reqBody.tagServer = false;
}
reqBody.projectName = $projectList.find('option:selected').text();
if (!((reqBody.bgId && reqBody.bgId.length) && (reqBody.projectId && reqBody.projectId.length) && reqBody.projectId !== 'choose' && reqBody.bgId !== 'choose')) {
alert('Please Select a Business Group & Project');
Expand Down
15 changes: 15 additions & 0 deletions client/htmls/private/js/dev/awsProduction.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

var checkandupdateRunlistTable = function() {
if (!$.fn.dataTable.isDataTable('#tableRunlistForBlueprint')) {
$tasksRunlist = $('#tableRunlistForBlueprint').DataTable({
Expand Down Expand Up @@ -1554,6 +1555,10 @@ var saveblueprint = function(tempType) {
reqBody.orgId = $('#orgnameSelect').val();
reqBody.bgId = $('#bgListInput').val();
reqBody.projectId = $('#projectListInput').val();
if ($('#serviceDeliveryCheck').prop("checked")) {
reqBody.botType = $('#botType').val();
reqBody.shortDesc = $('#shortDesc').val();
}
var imageIdentifier = $('#imageId').val();
var imageId = $('#imageId').find('option:selected').attr('_id');
var securityGroupIds = getSecurityCheckedList();
Expand Down Expand Up @@ -3450,4 +3455,14 @@ $(".repoTypeSelectorRadioBtn").click(function() {
var val = $(this).attr('data-repotype');
$('.repoTypeClass').hide();
$('#' + val).show();
});

$(document).ready(function() {
$('#serviceDeliveryCheck').click(function() {
if ($('#serviceDeliveryCheck').prop("checked")) {
$('.sevice-delivery-section').addClass('showservice');
} else {
$('.sevice-delivery-section').removeClass('showservice');
}
});
});