diff --git a/apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/model/view/OrganizationSimpleView.java b/apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/model/view/OrganizationSimpleView.java index fc9d00db..e30a32df 100644 --- a/apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/model/view/OrganizationSimpleView.java +++ b/apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/model/view/OrganizationSimpleView.java @@ -46,6 +46,10 @@ public class OrganizationSimpleView implements Serializable, Comparable - - - - diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/modals/resolve_conflicts.html b/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/parts/resolve_conflicts.modal.html similarity index 100% rename from apps/dnet-orgs-database-application/src/main/resources/static/resources/html/modals/resolve_conflicts.html rename to apps/dnet-orgs-database-application/src/main/resources/static/resources/html/parts/resolve_conflicts.modal.html diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/modals/select_org.html b/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/parts/select_org.modal.html similarity index 100% rename from apps/dnet-orgs-database-application/src/main/resources/static/resources/html/modals/select_org.html rename to apps/dnet-orgs-database-application/src/main/resources/static/resources/html/parts/select_org.modal.html diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/resources/js/organizations.js b/apps/dnet-orgs-database-application/src/main/resources/static/resources/js/organizations.js index 897add20..0430131c 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/resources/js/organizations.js +++ b/apps/dnet-orgs-database-application/src/main/resources/static/resources/js/organizations.js @@ -54,7 +54,7 @@ orgsModule.directive('selectOrgModal', function($http, $timeout) { 'selectedOrg' : '=', 'onSelect' : '&' }, - templateUrl: 'resources/html/modals/select_org.html', + templateUrl: 'resources/html/parts/select_org.modal.html', link: function(scope, element, attrs, ctrl) { scope.searchOrgs = {}; scope.searchText = ''; @@ -96,7 +96,7 @@ orgsModule.directive('resolveConflictsModal', function($http, $route) { 'orgs' : '=', 'selectedOrgs' : '=' }, - templateUrl: 'resources/html/modals/resolve_conflicts.html', + templateUrl: 'resources/html/parts/resolve_conflicts.modal.html', link: function(scope, element, attrs, ctrl) { scope.selectOrg = function(org) { var sel = angular.copy(org); @@ -244,6 +244,7 @@ orgsModule.directive('orgResultsPage', function($http, $location, $route) { scope.selectedOrg.city = o.city; scope.selectedOrg.country = o.country; scope.selectedOrg.acronyms = o.acronyms; + scope.selectedOrg.urls = o.urls; scope.selectedOrg.status = o.status; if (scope.onSelect) { @@ -273,9 +274,9 @@ orgsModule.directive('orgDuplicates', function($http, $location, $route) { 'localId' : scope.orgId, 'oaOriginalId' : scope.newDuplicate.id, 'oaName' : scope.newDuplicate.name, - 'oaAcronym' : scope.newDuplicate.acronyms, + 'oaAcronym' : scope.newDuplicate.acronyms.join(), 'oaCountry' : scope.newDuplicate.country, - 'oaUrl' : '-', + 'oaUrl' : scope.newDuplicate.urls.join(), 'oaCollectedFrom' : 'user', 'relType' : 'is_similar' });