From bf28a0ba090994fbb3ed0fb8e8df646d9c59c273 Mon Sep 17 00:00:00 2001
From: "michele.artini" <michele.artini@isti.cnr.it>
Date: Fri, 23 Apr 2021 09:37:15 +0200
Subject: [PATCH] ui

---
 .../resources/html/pages/search/resultsByCountry.html       | 2 +-
 .../static/resources/html/pages/search/resultsByType.html   | 2 +-
 .../static/resources/html/pages/search/searchResults.html   | 2 +-
 .../static/resources/html/parts/org_results_page.html       | 6 +++---
 .../static/resources/html/parts/select_org.modal.html       | 3 +--
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/search/resultsByCountry.html b/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/search/resultsByCountry.html
index 2d587359..16c37184 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/search/resultsByCountry.html
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/search/resultsByCountry.html
@@ -2,4 +2,4 @@
 	orgs="orgs" 
 	prev-function="prev()" 
 	next-function="next()"
-	show-status="true"></org-results-page>
+	show-status="1"></org-results-page>
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/search/resultsByType.html b/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/search/resultsByType.html
index a31a5742..a6ae7870 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/search/resultsByType.html
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/search/resultsByType.html
@@ -2,4 +2,4 @@
 	orgs="orgs" 
 	prev-function="prev()" 
 	next-function="next()"
-	show-status="true"></org-results-page>
+	show-status="1"></org-results-page>
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/search/searchResults.html b/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/search/searchResults.html
index 4662a5a9..28f644b5 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/search/searchResults.html
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/search/searchResults.html
@@ -2,4 +2,4 @@
 	orgs="orgs" 
 	prev-function="prev()" 
 	next-function="next()"
-	show-status="true"></org-results-page>
+	show-status="1"></org-results-page>
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/parts/org_results_page.html b/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/parts/org_results_page.html
index d486bac7..e1006a3b 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/parts/org_results_page.html
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/parts/org_results_page.html
@@ -35,7 +35,7 @@
 	    	</li>
 		</ul>
 	</nav>
-	
+
 	<table class="table table-sm table-hover" ng-if="orgs.content.length > 0">
 		<thead class="thead-light">
 			<tr class="d-flex">
@@ -46,11 +46,11 @@
 			</tr>
 		</thead>
 		<tbody>
-			<tr ng-repeat="o in orgs.content" class="d-flex" ng-class="{'table-warning' : o.showStatus && o.status != 'approved'}">
+			<tr ng-repeat="o in orgs.content" class="d-flex" ng-class="{'table-warning' : showStatus && o.status != 'approved'}">
 				<td class="col-6">
 					<a ng-if="mode == 'select-modal'" href="javascript:void(0)" title="{{o.id}}" ng-click="selectOrg(o)" data-dismiss="modal">{{o.name}}</a>
 					<a ng-if="mode != 'select-modal'" href="#!/edit/0/{{o.id}}" title="{{o.id}}">{{o.name}}</a>
-					<span class="badge badge-warning" ng-if="o.showStatus && o.status != 'approved'">{{o.status}}</span>
+					<span class="badge badge-warning" ng-if="showStatus && o.status != 'approved'">{{o.status}}</span>
 				</td>
 				<td class="col-4"><img ng-src="resources/images/flags/{{o.country}}.gif" /> {{o.city || '-'}}, {{o.country}}</td>
 				<td class="col-1 text-center">{{o.acronyms.join()}}</td>
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/parts/select_org.modal.html b/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/parts/select_org.modal.html
index c401e8c0..243eede8 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/parts/select_org.modal.html
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/parts/select_org.modal.html
@@ -18,8 +18,7 @@
 						next-function="search(searchValue, searchOrgs.number + 1, searchOrgs.size)"
 						on-select="selectOrg()"
 						selected-org="selectedOrg"
-						mode="select-modal"
-						show-status="true"></org-results-page>
+						mode="select-modal"></org-results-page>
 					
 				</div>
 			</div>