Skip to content

Resolved JShint errors. #980

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 2 commits into from
Nov 28, 2016
Merged

Resolved JShint errors. #980

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a446bd5
Resolved JShint errors.
divakarkonakalla Nov 25, 2016
1b4022f
resolved jshint error
divakarkonakalla Nov 25, 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
2 changes: 1 addition & 1 deletion client/cat3/src/partials/sections/dashboard/analytics/controller/capacityCtrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@
capaCtr.capaGridOptions.columnDefs.push({
name: keyChild,
field: 'capacity.AWS.services.' + keyChild
})
});
angular.forEach(result.splitUpCapacities[viewType], function (valBar) {
var chVal = '';
if (valBar.capacity.AWS.services[keyChild]) {
Expand Down
2 changes: 1 addition & 1 deletion client/cat3/src/partials/sections/dashboard/bots/controller/audittrailCtrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
keyboard: false,
resolve: {
items: function() {
return hist
return hist;
}
}
});
Expand Down
3 changes: 1 addition & 2 deletions client/cat3/src/partials/sections/dashboard/bots/controller/botLogsCtrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
var requestObj = {
"instanceIds": nodeIds
};
var bluePrintJob = false;
workzoneServices.postRetrieveDetailsForInstanceNames(requestObj).then(function (response) {
var _jobInstances = response.data;
for (var k = 0; k < $scope.nodeIdsWithActionLog.length; k++) {
Expand Down Expand Up @@ -81,6 +80,6 @@

$scope.cancel = function() {
$modalInstance.dismiss('cancel');
}
};
}]);
})(angular);
1 change: 0 additions & 1 deletion client/cat3/src/partials/sections/dashboard/bots/controller/editParamsCtrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@
$scope.jenkinsparams = items.taskConfig.parameterized;
$scope.scriptparams = items.taskConfig.scriptDetails;
$scope.parameters=[''];
var taskData={};
var cookbookAttributes = [];
var scriptParams = [];
var choiceParam = {};
Expand Down
4 changes: 2 additions & 2 deletions client/cat3/src/partials/sections/dashboard/design/aDesignCtrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
return deferred.promise;
}]
}
})
});
}]).filter('inArray',['$filter', function($filter){
return function(list, arrayFilter, element){
if(arrayFilter){
Expand Down Expand Up @@ -126,7 +126,7 @@
$rootScope.$emit('BP_BLUEPRINTS_REFRESH_CURRENT');
return genericServices.promiseGet(params);
}
}
};
design.providersList();
return design;
}]);
Expand Down
34 changes: 17 additions & 17 deletions client/cat3/src/partials/sections/dashboard/design/controllers/blueprintCreateCtrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
blueprintCreation.getImages();
} else {
blueprintCreation.templateListing();
};
}

blueprintCreation.getOperatingSytems = function(){
$scope.isOSLoading = true;
Expand Down Expand Up @@ -155,13 +155,13 @@
blueprintCreation.changeImageOS = function(){
blueprintCreation.newEnt.providers = null;
blueprintCreation.providerListing = [];
blueprintCreation.newEnt.images = null
blueprintCreation.newEnt.images = null;
blueprintCreation.imageListing = [];
blueprintCreation.instanceType = [];
blueprintCreation.regionListing = null;
blueprintCreation.keyPairListing = [];
blueprintCreation.regionListingAzure = [];
blueprintCreation.newEnt.vpcId = null
blueprintCreation.newEnt.vpcId = null;
blueprintCreation.vpcListing = [];
blueprintCreation.subnetListing = [];
blueprintCreation.newEnt.subnetId = null;
Expand Down Expand Up @@ -273,7 +273,7 @@
}
}
}
};
}
};

blueprintCreation.postSubnets = function() {
Expand Down Expand Up @@ -389,14 +389,14 @@
bpCreateSer.getRepoList(bpCreate.serverRepos[bpCreate.newEnt.nexusDockerServer].rowid).then(function (repositoryResult) {
$scope.isLoadingNexus = false;
blueprintCreation.repositoryOptions = repositoryResult.data[0].repositories.docker;
if(blueprintCreation.repositoryOptions.length == 0){
if(blueprintCreation.repositoryOptions.length === 0){
blueprintCreation.errorMsg= {
text: "Repository is not defined",
type: "warning",
repository:true,
role:"tooltip",
positions:"bottom"
}
};
}
});
}
Expand Down Expand Up @@ -460,9 +460,9 @@

blueprintCreation.getRepositoryDetails = function() {
if(bpCreate.newEnt.nexusDockerRepo.configType === 'nexus') {

console.log('nexus');
}
}
};

blueprintCreation.selectServer = function() {
if(blueprintCreation.newEnt.nexusDockerRepo) {
Expand All @@ -483,8 +483,8 @@
blueprintCreation.getRegionLists = function() {
bpCreateSer.getRegionLists().then(function(data){
blueprintCreation.getRegionLists = data;
})
}
});
};

blueprintCreation.getTemplateParameters = function() {
$scope.cftTemplate = $scope.templateSelected;
Expand All @@ -508,13 +508,13 @@

blueprintCreation.hideVMEvals = function() {
$scope.isVMEvalsVisible = false;
}
};

blueprintCreation.checkForResource = function() {
if(blueprintCreation.newEnt.armModelResources !==null){
$scope.isVMEvalsVisible = true;
}
}
};

blueprintCreation.getResourceGroups = function() {
$scope.isResourceGroupLoading = true;
Expand Down Expand Up @@ -546,7 +546,7 @@

$scope.updateCookbook = function() {
genericServices.editRunlist($scope.chefrunlist,$scope.cookbookAttributes);
}
};

$rootScope.$on('WZ_ORCHESTRATION_REFRESH_CURRENT', function(event,reqParams) {
$scope.chefrunlist = reqParams.list;
Expand Down Expand Up @@ -764,7 +764,7 @@
"repoName": blueprintCreation.repositoryOptions[blueprintCreation.newEnt.repositoryInd].name,
"artifactId": blueprintCreation.newEnt.artifact,
"groupId": blueprintCreation.newEnt.groupId
}
};
blueprintCreateJSON.nexus = nexus;
}else{
var docker = {
Expand Down Expand Up @@ -792,7 +792,7 @@
var parameterObj = {
ParameterKey: key,
ParameterValue: value.Default
}
};
cftParameters.push(parameterObj);
blueprintCreateJSON.cftStackParameters = cftParameters;
});
Expand All @@ -817,7 +817,7 @@
ParameterKey: key,
ParameterValue: value.value
//type: value.type
}
};
cftParameters.push(parameterObj);
blueprintCreateJSON.cftStackParameters = cftParameters;
});
Expand All @@ -830,7 +830,7 @@
username: blueprintCreation.getAzureVMDetails[i].username,
password: blueprintCreation.getAzureVMDetails[i].password
//runlist:[]
}
};
blueprintCreateJSON.cftInstances = instanceObj;

}
Expand Down
2 changes: 1 addition & 1 deletion client/cat3/src/partials/sections/dashboard/design/controllers/createCompositeCtrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
createCBP.newEnt.org =$rootScope.organNewEnt.org.rowid;
createCBP.newEnt.buss=$rootScope.organNewEnt.buss.rowid;
createCBP.newEnt.proj=$rootScope.organNewEnt.proj.rowId;
};
}
$scope.blueprintList = [];
angular.forEach(createCBP.SelectedBPList, function(val){
var blueprintObj={
Expand Down
4 changes: 2 additions & 2 deletions client/cat3/src/partials/sections/dashboard/genericServices.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,8 +275,8 @@
}
}
})
.result.then(function(selectedItem) {
//$scope.selected = selectedItem;
.result.then(function() {

}, function() {

});
Expand Down
12 changes: 6 additions & 6 deletions ...3/src/partials/sections/dashboard/popups/controller/orchestrationUpdateChefRunlistCtrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
$scope.allCBAttributes = [];
$scope.editRunListAttributes = [];

$scope.getCookBookListForOrg = function(getCookBooks) {
$scope.getCookBookListForOrg = function() {
var p = workzoneEnvironment.getEnvParams();
genericServices.getTreeNew().then(function (orgs) {
$scope.organObject=orgs;
Expand All @@ -33,19 +33,19 @@
} else {
param = {
url: '/organizations/' + $scope.organObject[0].orgid + '/chefRunlist'
}
};
}
genericServices.promiseGet(param).then(function (result) {
$scope.getCookBooks = result;
var params;
if(p){
params = {
url: '/d4dMasters/org/' + p.org + '/templateType/SoftwareStack/templates'
}
};
}else {
params = {
url: '/d4dMasters/org/' + $scope.organObject[0].orgid + '/templateType/SoftwareStack/templates'
}
};
}
genericServices.promiseGet(params).then(function (result) {
$scope.getTemplates = result;
Expand Down Expand Up @@ -78,11 +78,11 @@
$scope.isOrchestrationUpdateChefRunLoading = false;
$scope.init();
});
}
};
$scope.getCookBookListForOrg();
function registerUpdateEvent(obj) {
obj.addListUpdateListener('updateList', $scope.updateAttributeList);
};
}

$scope.init = function () {
$timeout(function () {
Expand Down
4 changes: 2 additions & 2 deletions client/cat3/src/partials/sections/dashboard/popups/controller/scheduleCtrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
sch.interval[i].days.splice(sch.interval[i].days.indexOf(d),1);
}
if(sch.interval[i].days.length >0){
sch.interval[i].daySelect=1
sch.interval[i].daySelect=1;
} else{
sch.interval[i].daySelect='';
}
Expand All @@ -44,7 +44,7 @@
var params={
url:'/instances/'+sch.instanceIds[0]
//url:'src/partials/sections/dashboard/workzone/data/oneIns.json'
}
};
genericServices.promiseGet(params).then(function (result) {
sch.isScheduled=result.isScheduled;
sch.schedulerStartOn=moment(result.schedulerStartOn).format('MM/DD/YYYY');
Expand Down
2 changes: 0 additions & 2 deletions client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchCtrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,6 @@
$scope.launchResponse = {error:message};
$scope.launchMessage = messageHelper.launchMessage();
});
} else {

}
}
]);
Expand Down
1 change: 0 additions & 1 deletion client/cat3/src/partials/sections/dashboard/workzone/instance/instanceCtrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,6 @@
so that it gets replaced with instanceIP*/
helper.setHostToIp(result.data.instances);
$scope.tabData = $scope.instanceList;
console.log($scope.instanceList);
if ($scope.totalCards > $scope.paginationParams.pageSize) {
$scope.cardsAvailable = true;
} else {
Expand Down
4 changes: 2 additions & 2 deletions client/cat3/src/partials/sections/dashboard/workzone/instance/manage/controlPanelCtrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
var params={
url:'/instances/'+cpInstance._id
//url:'src/partials/sections/dashboard/workzone/data/oneIns.json'
}
};
genericServices.promiseGet(params).then(function (result) {
$scope.schedule={
instanceIds:[cpInstance._id],
Expand All @@ -98,7 +98,7 @@
$scope.schedule.interval[i].days.splice($scope.schedule.interval[i].days.indexOf(d),1);
}
if($scope.schedule.interval[i].days.length >0){
$scope.schedule.interval[i].daySelect=1
$scope.schedule.interval[i].daySelect=1;
} else{
$scope.schedule.interval[i].daySelect='';
}
Expand Down