Merge branch 'development' of https://github.com/wazuh/wazuh-kibana-ui into development

This commit is contained in:
jesmg 2016-09-08 12:57:29 +00:00
commit 74c7c92a32
2 changed files with 4 additions and 4 deletions

View File

@ -97,7 +97,7 @@ app.controller('fimController', function ($scope, DataFactory, $mdToast) {
loadWatch = $scope.$watch(function () {
return $scope.$parent._agent;
}, function () {
DataFactory.initialize('get', '/syscheck/' + $scope.$parent._agent.id + '/files', {}, 100, 0)
DataFactory.initialize('get', '/syscheck/' + $scope.$parent._agent.id, {}, 100, 0)
.then(function (data) {
DataFactory.clean(objectsArray['/files']);
objectsArray['/files'] = data;
@ -117,7 +117,7 @@ app.controller('fimController', function ($scope, DataFactory, $mdToast) {
};
var load = function () {
DataFactory.initialize('get', '/syscheck/' + $scope.$parent._agent.id + '/files', {}, 100, 0)
DataFactory.initialize('get', '/syscheck/' + $scope.$parent._agent.id, {}, 100, 0)
.then(function (data) {
objectsArray['/files'] = data;
DataFactory.get(objectsArray['/files'])

View File

@ -63,7 +63,7 @@ module.exports = function (server, options) {
var payload = {
'offset': offset ? offset : 0,
'limit': (10 < maxSize) ? 10 : maxSize
'limit': (250 < maxSize) ? 250 : maxSize
};
var options = {
@ -168,4 +168,4 @@ module.exports = function (server, options) {
});
};
}
}