diff --git a/apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/controller/VocabulariesController.java b/apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/controller/VocabulariesController.java index 26598c32..04d35330 100644 --- a/apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/controller/VocabulariesController.java +++ b/apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/controller/VocabulariesController.java @@ -33,10 +33,9 @@ public class VocabulariesController extends AbstractDnetController { vocs.put("languages", databaseUtils.listValuesOfVocabularyTable(VocabularyTable.languages)); vocs.put("relTypes", Arrays.stream(RelationType.values()) - .filter(t -> t != RelationType.Merged_In) - .filter(t -> t != RelationType.Merges) - .map(t -> new VocabularyTerm(t.toString(), t.toString())) + .map(t -> new VocabularyTerm(t.name(), t.name())) .collect(Collectors.toList())); + vocs.put("similaritiesType", Arrays.stream(SimilarityType.values()) .map(t -> new VocabularyTerm(t.toString(), t.toString())) .collect(Collectors.toList())); diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/parts/org_metadata.form.html b/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/parts/org_metadata.form.html index 9170dec7..90d25a25 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/parts/org_metadata.form.html +++ b/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/parts/org_metadata.form.html @@ -248,20 +248,22 @@
Related organization | -Type | -- | ||||
---|---|---|---|---|---|---|
No relations | +No relations | |||||
{{r.relatedOrgName}} | -{{r.type}} | +|||||
This organizazion + + + is parent of + is child of + is merged in + merges + is related to + + {{r.relatedOrgName}} + | @@ -269,20 +271,23 @@ | |||||
This organization | ++ + | - - | -- - | @@ -294,7 +299,6 @@ - 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 8aa37a12..56e7a3b4 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 @@ -167,7 +167,7 @@ orgsModule.directive('orgFormMetadata', function($http, $location, $route, $rout scope.newRelation = {}; } - scope.addNewRelation = function(r) { + scope.addNewRelation = function() { scope.org.relations.push({ 'relatedOrgId' : scope.newRelation.id, 'relatedOrgName' : scope.newRelation.name, |