Author: brett
Date: Thu Feb 15 09:44:11 2007
New Revision: 508033
URL: http://svn.apache.org/viewvc?view=rev&rev=508033
Log:
handle companyPom being set, but fields being empty
Modified:
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp
Modified:
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp?view=diff&rev=508033&r1=508032&r2=508033
==============================================================================
---
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp
(original)
+++
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp
Thu Feb 15 09:44:11 2007
@@ -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>
