From 502f28dfd315d9df4f143ff4b8f152b5695a1a97 Mon Sep 17 00:00:00 2001
From: "michele.artini" <michele.artini@isti.cnr.it>
Date: Fri, 30 Oct 2020 11:51:52 +0100
Subject: [PATCH] fix all differents only for all elements

---
 .../java/eu/dnetlib/organizations/utils/DatabaseUtils.java    | 4 ++--
 .../static/resources/html/parts/resolve_conflicts.modal.html  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/utils/DatabaseUtils.java b/apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/utils/DatabaseUtils.java
index c6b89581..65771b50 100644
--- a/apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/utils/DatabaseUtils.java
+++ b/apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/utils/DatabaseUtils.java
@@ -200,14 +200,14 @@ public class DatabaseUtils {
 
 	@Cacheable("vocs")
 	public List<VocabularyTerm> listValuesOfVocabularyTable(final VocabularyTable table) {
-		final String sql = "select val as value, name as name from " + table;
+		final String sql = "select val as value, name as name from " + table + " order by name";
 		return jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(VocabularyTerm.class));
 	}
 
 	@Cacheable("countries_for_user")
 	public List<VocabularyTerm> listCountriesForUser(final String name) {
 		final String sql =
-			"select uc.country as value, c.name as name from user_countries uc left outer join countries c on (c.val = uc.country) where uc.email = ?";
+			"select uc.country as value, c.name as name from user_countries uc left outer join countries c on (c.val = uc.country) where uc.email = ? order by c.name";
 		return jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(VocabularyTerm.class), name);
 	}
 
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/parts/resolve_conflicts.modal.html b/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/parts/resolve_conflicts.modal.html
index d66c80cb..8a3a2ac1 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/parts/resolve_conflicts.modal.html
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/parts/resolve_conflicts.modal.html
@@ -38,7 +38,7 @@
 								<div class="card-footer" ng-show="selectedOrgs.length > 0">
 									<button type="button" class="btn btn-sm btn-secondary" ng-click="reset()" ng-show="selectedOrgs.length > 0">reset</button>
 									<div class="btn-group float-right" ng-show="selectedOrgs.length > 1">
-										<button type="button" class="btn btn-sm btn-danger" ng-click="invalidateGroup()">all differents</button>
+										<button type="button" class="btn btn-sm btn-danger" ng-click="invalidateGroup()" ng-show="selectedOrgs.length == orgs.length">all differents</button>
 										<button type="button" class="btn btn-sm btn-primary" ng-click="mergeGroup()">merge</button>
 									</div>
 								</div>