D-Net
/
dnet-applications
16
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed a problem adding the same org as suplicate

This commit is contained in:
Michele Artini 2021-04-23 11:31:24 +02:00
parent 303e1433ac
commit cc6e65138e
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/utils/DatabaseUtils.java
View File

@ -217,6 +217,7 @@ public class DatabaseUtils {
simrels.stream() simrels.stream()
.map(OpenaireDuplicate::getOaOriginalId) .map(OpenaireDuplicate::getOaOriginalId)
.filter(id -> id.startsWith(OpenOrgsConstants.OPENORGS_PENDING_PREFIX)) .filter(id -> id.startsWith(OpenOrgsConstants.OPENORGS_PENDING_PREFIX))
.distinct()
.forEach(organizationRepository::deleteById); .forEach(organizationRepository::deleteById);
list.forEach(d -> { list.forEach(d -> {

9
apps/dnet-orgs-database-application/src/main/resources/static/resources/js/organizations.js
View File

@ -251,6 +251,14 @@ orgsModule.directive('orgDuplicates', function($http, $location, $route) {
scope.newDuplicate = {}; scope.newDuplicate = {};
scope.addDuplicate = function() { scope.addDuplicate = function() {
for (var i = 0; i < scope.duplicates.length; i++) {
if (scope.duplicates[i].oaOriginalId == scope.newDuplicate.id) {
alert("The selected organization has been already added !!!");
return;
}
}
scope.duplicates.push({ scope.duplicates.push({
'localId' : scope.orgId, 'localId' : scope.orgId,
'oaOriginalId' : scope.newDuplicate.id, 'oaOriginalId' : scope.newDuplicate.id,
@ -263,6 +271,7 @@ orgsModule.directive('orgDuplicates', function($http, $location, $route) {
'relType' : 'is_similar' 'relType' : 'is_similar'
}); });
// I find and copy the duplicates of the selected org
call_http_get($http, 'api/organizations/duplicates?id=' + scope.newDuplicate.id, function(res) { call_http_get($http, 'api/organizations/duplicates?id=' + scope.newDuplicate.id, function(res) {
angular.forEach(res.data, function(dup) { angular.forEach(res.data, function(dup) {
dup.localId = scope.orgId; dup.localId = scope.orgId;