From 8a0093023a6b92c81e607a398b2a6557948e860a Mon Sep 17 00:00:00 2001
From: "michele.artini" <michele.artini@isti.cnr.it>
Date: Thu, 22 Oct 2020 13:09:29 +0200
Subject: [PATCH] uis

---
 .../main/resources/static/resources/html/pages/edit/edit.html | 4 ++--
 .../src/main/resources/templates/home.html                    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/edit/edit.html b/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/edit/edit.html
index 66d6fa25..2687390f 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/edit/edit.html
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/edit/edit.html
@@ -16,7 +16,7 @@
 			<li class="nav-item" ng-show="org.status == 'approved'">
 				<a href="javascript:void(0)" class="nav-link" ng-class="{'active': currentTab == 2}" ng-click="gotoTab(2)">Duplicates <span class="badge badge-danger ml-2" ng-if="info.nDuplicates > 0" title="{{info.nDuplicates}} duplicate(s) to validate">new</span></a>
 			</li>
-			<li class="nav-item" ng-show="org.status == 'approved'">
+			<li class="nav-item" ng-show="org.status == 'approved' && adminMode">
 				<a href="javascript:void(0)" class="nav-link" ng-class="{'active': currentTab == 3}" ng-click="gotoTab(3)">Conflicts <span class="badge badge-danger ml-2" ng-if="info.nConflicts > 0" title="the current organization seems in conflict with {{info.nConflicts}} other(s)">new</span></a>
 			</li>
 		</ul>
@@ -38,7 +38,7 @@
 		<org-duplicates org-id="{{org.id}}" duplicates="duplicates" save-function="saveDuplicates()" show-save-button="1"></org-form-duplicates>
 	</div>
 
-	<div class="card-body" ng-if="currentTab == 3 && (org.status == 'approved' || org.status == 'suggested')">
+	<div class="card-body" ng-if="adminMode && currentTab == 3 && (org.status == 'approved' || org.status == 'suggested')">
 		<org-conflicts org="org" conflicts="conflicts" save-function="saveConflicts()" show-save-button="1"></org-form-conflicts>
 	</div>
 
diff --git a/apps/dnet-orgs-database-application/src/main/resources/templates/home.html b/apps/dnet-orgs-database-application/src/main/resources/templates/home.html
index e8476d3a..f3a5f346 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/templates/home.html
+++ b/apps/dnet-orgs-database-application/src/main/resources/templates/home.html
@@ -60,7 +60,7 @@ fieldset > legend        { font-size      : 1.2rem !important; }
 				<li class="nav-item dropdown" sec:authorize="hasRole('ROLE_USER')">
 					<a class="nav-link dropdown-toggle" href="javascript:void(0)" data-toggle="dropdown">Advanced</a>
 					<div class="dropdown-menu">
-						<a class="dropdown-item d-flex justify-content-between align-items-center" href="#!/duplicates/_"><span class="pr-2">duplicates</span><span class="badge badge-primary badge-pill">{{info.total.nDuplicates}}</span></a>
+						<a class="dropdown-item d-flex justify-content-between align-items-center" href="#!/duplicates/_"><span class="pr-2">duplicates</span><span class="badge badge-primary badge-pill">{{info.data.total.nDuplicates}}</span></a>
 						<div class="dropdown-divider"></div>
 						<a class="dropdown-item" href="#!/new">suggest a new organization</a>
 					</div>