Revision 58353
Added by Michele Artini almost 4 years ago
organizations.js | ||
---|---|---|
549 | 549 |
$scope.info = {}; |
550 | 550 |
$scope.conflicts = []; |
551 | 551 |
$scope.duplicates = []; |
552 |
$scope.newGroups = []; |
|
553 | 552 |
$scope.currentTab = $routeParams.tab; |
554 | 553 |
$scope.country = $routeParams.country; |
555 | 554 |
|
... | ... | |
561 | 560 |
var found = ''; |
562 | 561 |
|
563 | 562 |
angular.forEach($scope.info.byCountry, function(values, c) { |
564 |
if (!found && (($scope.currentTab == 1 && values.nGroups > 0) || ($scope.currentTab == 2 && values.nDuplicates > 0) || ($scope.currentTab == 3 && values.nConflicts > 0))) {
|
|
563 |
if (!found && (($scope.currentTab == 1 && values.nDuplicates > 0) || ($scope.currentTab == 2 && values.nConflicts > 0))) {
|
|
565 | 564 |
found = c; |
566 | 565 |
} |
567 | 566 |
}); |
... | ... | |
576 | 575 |
$scope.refresh = function() { |
577 | 576 |
$scope.conflicts = []; |
578 | 577 |
$scope.duplicates = []; |
579 |
$scope.newGroups = []; |
|
580 | 578 |
|
581 | 579 |
if ($scope.country != '_') { |
582 | 580 |
if ($scope.currentTab == 1) { |
583 |
$scope.groups = []; //TODO |
|
584 |
} else if ($scope.currentTab == 2) { |
|
585 | 581 |
$http.get('api/organizations/duplicates/byCountry/' + $scope.country).then(function successCallback(res) { |
586 | 582 |
if((typeof res.data) == 'string') { alert("Session expired !"); location.reload(true); } |
587 | 583 |
$scope.duplicates = res.data; |
... | ... | |
591 | 587 |
}, function errorCallback(res) { |
592 | 588 |
alert('ERROR: ' + res.data.error + ' (' + res.data.message + ')'); |
593 | 589 |
}); |
594 |
} else if ($scope.currentTab == 3) {
|
|
590 |
} else if ($scope.currentTab == 2) {
|
|
595 | 591 |
$http.get('api/organizations/conflicts/byCountry/' + $scope.country).then(function successCallback(res) { |
596 | 592 |
if((typeof res.data) == 'string') { alert("Session expired !"); location.reload(true); } |
597 | 593 |
$scope.conflicts = res.data; |
Also available in: Unified diff
removed unused tab (groups)