handle companyPom being set, but fields being empty

git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@508033 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp
index 9cd84c286a48a57570a6d6feef515f12f2b06318..dfebffbc9582cd0c193455051bd755133ae2440f 100644 (file)
--- a/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp
+++ b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp
@@ -39,13 +39,13 @@
 
 <ww:set name="companyPom" value="companyPom"/>
 
-<c:if test="${empty(companyPom)}">
+<c:if test="${empty(companyPom.groupId) || empty(companyPom.artifactId)}">
   <p>
     You have not yet specified a company POM. <a href="<ww:url action='editAppearance' />">Select a Company POM</a>
   </p>
 </c:if>
 
-<c:if test="${!empty(companyPom)}">
+<c:if test="${!empty(companyPom.groupId) && !empty(companyPom.artifactId)}">
   <p>
     Your selected company POM is below. If you would like to change the organization name, url or logo, you can
     <a href="<ww:url action='editCompanyPom'/>">edit the POM</a>.
@@ -93,4 +93,4 @@
   </c:choose>
 </c:if>
 </body>
-</html>
\ No newline at end of file
+</html>