From c2939ffd8d42504d8d3c017c4a8985867efaee7b Mon Sep 17 00:00:00 2001
From: Matija Obreza <matija.obreza@croptrust.org>
Date: Tue, 4 Aug 2015 19:02:19 +0200
Subject: [PATCH] Make PDCI public

---
 .../webapp/WEB-INF/jsp/accession/details.jsp  | 41 +++++++++----------
 .../WEB-INF/jsp/organization/details.jsp      | 41 +++++++++----------
 src/main/webapp/WEB-INF/jsp/wiews/details.jsp | 40 +++++++++---------
 3 files changed, 57 insertions(+), 65 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/accession/details.jsp b/src/main/webapp/WEB-INF/jsp/accession/details.jsp
index 69a6b8d00..5bc6fb608 100644
--- a/src/main/webapp/WEB-INF/jsp/accession/details.jsp
+++ b/src/main/webapp/WEB-INF/jsp/accession/details.jsp
@@ -643,32 +643,29 @@
   </div>
 
 
-  <security:authorize access="isAuthenticated()">
-    <c:if test="${pdci ne null}">
-      <div class="crop-details">
+  <c:if test="${pdci ne null}">
+    <div class="crop-details">
 
-        <h4>
-          <spring:message code="accession.pdci" />
-        </h4>
-        <div class="jumbotron pdci-score">
-          <div>
-            <h3>
-              <spring:message code="accession.pdci.jumbo" arguments="${pdci.score}" />
-            </h3>
-            <small> <c:if test="${institutePDCI ne null and institutePDCI.count > 0}">
-                <spring:message code="accession.pdci.institute-avg" arguments="${institutePDCI.avg}" />
-              </c:if> <a href="<c:url value="/content/passport-data-completeness-index" />"><spring:message
-                  code="accession.pdci.about-link"
-                /></a></small>
-          </div>
+      <h4>
+        <spring:message code="accession.pdci" />
+      </h4>
+      <div class="jumbotron pdci-score">
+        <div>
+          <h3>
+            <spring:message code="accession.pdci.jumbo" arguments="${pdci.score}" />
+          </h3>
+          <small> <c:if test="${institutePDCI ne null and institutePDCI.count > 0}">
+              <spring:message code="accession.pdci.institute-avg" arguments="${institutePDCI.avg}" />
+            </c:if> <a href="<c:url value="/content/passport-data-completeness-index" />"><spring:message
+                code="accession.pdci.about-link"
+              /></a></small>
         </div>
-
-        <local:pdci value="${pdci}" />
-
       </div>
-    </c:if>
-  </security:authorize>
 
+      <local:pdci value="${pdci}" />
+
+    </div>
+  </c:if>
 
   <c:if test="${methods.size() gt 0}">
 
diff --git a/src/main/webapp/WEB-INF/jsp/organization/details.jsp b/src/main/webapp/WEB-INF/jsp/organization/details.jsp
index e82320f9a..03d5cd6c9 100644
--- a/src/main/webapp/WEB-INF/jsp/organization/details.jsp
+++ b/src/main/webapp/WEB-INF/jsp/organization/details.jsp
@@ -74,30 +74,27 @@
   </ul>
 
 
-  <security:authorize access="isAuthenticated()">
-    <c:if test="${statisticsPDCI.count gt 0}">
-      <h3>
-        <spring:message code="accession.pdci" />
-      </h3>
-      <p><spring:message code="accession.pdci.stats-text" arguments="${statisticsPDCI.elStats}" /></p>
+  <c:if test="${statisticsPDCI.count gt 0}">
+    <h3>
+      <spring:message code="accession.pdci" />
+    </h3>
+    <p><spring:message code="accession.pdci.stats-text" arguments="${statisticsPDCI.elStats}" /></p>
 
-      <div class="chart chart-histogram">
-        <div id="chartPDCI" style="height: 200px"></div>
-      </div>
-
-      <p>
-        <a href="<c:url value="/content/passport-data-completeness-index" />"><spring:message
-            code="accession.pdci.about-link"
-          /></a>
-      </p>
-     <%--  <div class="row">
-        <c:forEach items="${statisticsPDCI.histogram}" var="item" varStatus="index">
-          <div class="col-xs-1">${index.count}=${item}</div>
-        </c:forEach>
-      </div> --%>
-    </c:if>
-  </security:authorize>
+    <div class="chart chart-histogram">
+      <div id="chartPDCI" style="height: 200px"></div>
+    </div>
 
+    <p>
+      <a href="<c:url value="/content/passport-data-completeness-index" />"><spring:message
+          code="accession.pdci.about-link"
+        /></a>
+    </p>
+   <%--  <div class="row">
+      <c:forEach items="${statisticsPDCI.histogram}" var="item" varStatus="index">
+        <div class="col-xs-1">${index.count}=${item}</div>
+      </c:forEach>
+    </div> --%>
+  </c:if>
 
   <content tag="javascript"> <script type="text/javascript">
 	jQuery(document).ready(function() {	
diff --git a/src/main/webapp/WEB-INF/jsp/wiews/details.jsp b/src/main/webapp/WEB-INF/jsp/wiews/details.jsp
index 831bd0516..da155816a 100644
--- a/src/main/webapp/WEB-INF/jsp/wiews/details.jsp
+++ b/src/main/webapp/WEB-INF/jsp/wiews/details.jsp
@@ -201,29 +201,27 @@
 
   </div>
 
-  <security:authorize access="isAuthenticated()">
-    <c:if test="${statisticsPDCI.count gt 0 and statisticsPDCI.count eq countByInstitute}">
-      <h3>
-        <spring:message code="accession.pdci" />
-      </h3>
-      <p>
-        <spring:message code="accession.pdci.stats-text" arguments="${statisticsPDCI.elStats}" />
-      </p>
+  <c:if test="${statisticsPDCI.count gt 0 and statisticsPDCI.count eq countByInstitute}">
+    <h3>
+      <spring:message code="accession.pdci" />
+    </h3>
+    <p>
+      <spring:message code="accession.pdci.stats-text" arguments="${statisticsPDCI.elStats}" />
+    </p>
 
-      <div class="chart chart-histogram">
-        <div id="chartPDCI" style="height: 200px"></div>
-      </div>
+    <div class="chart chart-histogram">
+      <div id="chartPDCI" style="height: 200px"></div>
+    </div>
 
-      <p>
-        <a href="<c:url value="/content/passport-data-completeness-index" />"><spring:message
-            code="accession.pdci.about-link"
-          /></a>
-      </p>
-      <%-- <c:forEach items="${statisticsPDCI.histogram}" var="item" varStatus="index">
-      <div>${index.count}=${item}</div>
-    </c:forEach> --%>
-    </c:if>
-  </security:authorize>
+    <p>
+      <a href="<c:url value="/content/passport-data-completeness-index" />"><spring:message
+          code="accession.pdci.about-link"
+        /></a>
+    </p>
+    <%-- <c:forEach items="${statisticsPDCI.histogram}" var="item" varStatus="index">
+    <div>${index.count}=${item}</div>
+  </c:forEach> --%>
+  </c:if>
 
   <c:if test="${countByInstitute gt 0}">
     <form class="form-horizontal" method="post" action="/download/wiews/${faoInstitute.code}/download">
-- 
GitLab