valitydev/wazuh-kibana-app
14
0
Fork 0
mirror of https://github.com/valitydev/wazuh-kibana-app.git synced 2024-11-08 02:38:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'loading-icon-17' of https://github.com/wazuh/wazuh-kibana-app-dev into loading-icon-17

Browse Source 
Conflicts:
	public/controllers/agents.js
	public/controllers/overview.js
	public/templates/agents-audit.html
	public/templates/agents-fim.html
	public/templates/agents-oscap.html
	public/templates/agents-overview.html
	public/templates/agents-pci.html
	public/templates/agents-pm.html
	public/templates/overview-audit.html
	public/templates/overview-fim.html
	public/templates/overview-general.html
	public/templates/overview-oscap.html
	public/templates/overview-pci.html
	public/templates/overview-pm.html
This commit is contained in:
malbarral 2017-07-03 16:03:48 +02:00
commit 82b5eeb6a1
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/controllers/overview.js
View File

@ -54,7 +54,6 @@ app.controller('overviewController', function ($scope, appState, $window, generi
if($scope.submenuNavItem != tab){
$scope.submenuNavItem = tab;
$location.search('tab', $scope.submenuNavItem);
$scope.presentData().then(function (data) {$scope.results = data;}, function(){ $scope.results = false;});
}else{
$scope.presentData().then(function (data) {$scope.results = data;}, function(){ $scope.results = false;});
@ -122,7 +121,6 @@ app.controller('overviewController', function ($scope, appState, $window, generi
// Load
$scope.presentData().then(function (data) {$scope.results = data;}, function(){ $scope.results = false;});
});
app.controller('overviewGeneralController', function ($scope, DataFactory, genericReq, errlog, $route) {