Skip to content
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

Jump to bottom

Fixes #10578: Cannot add node property when audit message is mandatory #1627

Merged
merged 1 commit into from
Apr 13, 2017
Merged

Fixes #10578: Cannot add node property when audit message is mandatory #1627

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
22 changes: 15 additions & 7 deletions rudder-web/src/main/webapp/javascript/rudder/angular/auditMode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,13 @@ app.factory('configGlobalFactory', function ($http){
});
}
, save : function(mode){
var overridableReason = "overridable"
if (!mode.overrideMode) {
overridableReason = "not overridable"
}
var data = { 'global_policy_mode' : mode.policyMode
, 'global_policy_mode_overridable' : mode.overrideMode
, 'reason' : "Change global policy mode to '"+mode.policyMode+"' ("+overridableReason+")"
};
return $http.post(this.url, data).then(function successCallback(response) {
return response.status==200;
Expand Down Expand Up @@ -85,13 +90,16 @@ app.factory('configNodeFactory', function ($http){
});
}
, save : function(mode){
var data = {'policyMode' : mode.policyMode};
return $http.post(this.url, data).then(function successCallback(response) {
return response.status==200;
}, function errorCallback(response) {
return response.status==200;
});
}
var data = {
'policyMode' : mode.policyMode
, 'reason' : "Change policy mode of node '"+nodeId+" to '"+mode.policyMode+"'"
};
return $http.post(this.url, data).then(function successCallback(response) {
return response.status==200;
}, function errorCallback(response) {
return response.status==200;
});
}
};
return this;
}
Expand Down
15 changes: 11 additions & 4 deletions rudder-web/src/main/webapp/javascript/rudder/angular/nodeProperties.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ app.controller('nodePropertiesCtrl', function ($scope, $http, $compile) {
, "sDom": '<"dataTables_wrapper_top"fl>rt<"dataTables_wrapper_bottom"ip>'
};

var currentNodeId;
$scope.init = function(properties, nodeId, right){
if(!right){
columnDefs[2].sClass = "hidden";
Expand All @@ -124,6 +125,7 @@ app.controller('nodePropertiesCtrl', function ($scope, $http, $compile) {
$scope.overrideOptions = overrideOptions;
//Get current node properties
$scope.properties = properties;
currentNodeId = nodeId;
$scope.urlAPI = contextPath + '/secure/api/latest/nodes/'+ nodeId;
$($scope.tableId).dataTable().fnAddData($scope.properties);
}
Expand All @@ -132,9 +134,10 @@ app.controller('nodePropertiesCtrl', function ($scope, $http, $compile) {
function checkNameUnicity(property, index, array) {
return property.name == $scope.newProperty.name;
}
var data = {"properties":[
$scope.newProperty
]};
var data = {
"properties": [ $scope.newProperty ]
, 'reason' : "Add property '"+$scope.newProperty.name+"' to Node '"+currentNodeId+"'"
};
$http.post($scope.urlAPI, data).then(function successCallback(response) {
$scope.errorSaving = false;
//Check if new property's name is already used or not.
Expand All @@ -156,7 +159,11 @@ app.controller('nodePropertiesCtrl', function ($scope, $http, $compile) {
$('#deletePropPopup').bsModal('show');
};
$scope.deleteProperty = function(){
var data = {"properties":[{"name":$scope.deletedProperty.name, "value":""}]};
var data = {
"properties":[{"name":$scope.deletedProperty.name, "value":""}]
, 'reason' : "Delete property '"+$scope.deletedProperty.name+"' to Node '"+currentNodeId+"'"
};

$scope.errorDeleting = false;
$http.post($scope.urlAPI, data).then(function successCallback(response) {
$('#deletePropPopup').bsModal('hide');
Expand Down