continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r554654 - in /maven/continuum/trunk/continuum-webapp/src/main: resources/localization/Continuum.properties webapp/WEB-INF/jsp/admin/editProfile.jsp
Date Mon, 09 Jul 2007 13:51:04 GMT
Author: evenisse
Date: Mon Jul  9 06:51:03 2007
New Revision: 554654

URL: http://svn.apache.org/viewvc?view=rev&rev=554654
Log:
[CONTINUUM-1337] Fix NPE during profile creation
Submitted by: Olivier Lamy

Modified:
    maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
    maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editProfile.jsp

Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties?view=diff&rev=554654&r1=554653&r2=554654
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
Mon Jul  9 06:51:03 2007
@@ -594,7 +594,7 @@
 profile.jdk.name.message = The JDK name
 profile.jdk.path.label = Jdk path
 profile.jdk.path.message = The JDK Path (JAVA_HOME value)
-
+profile.no.installations = No installations available
 # ----------------------------------------------------------------------
 # Page: Installations List
 # ----------------------------------------------------------------------

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editProfile.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editProfile.jsp?view=diff&rev=554654&r1=554653&r2=554654
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editProfile.jsp
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editProfile.jsp
Mon Jul  9 06:51:03 2007
@@ -65,7 +65,7 @@
           </ww:form>
           </td>
         </tr>
-        <ww:if test="profile.id != ''">
+        <ww:if test="profile.id != '' && ${not empty allInstallations} ">
           <tr>
             <td>
               <ww:form action="addInstallationProfile!addInstallation.action" method="get">
@@ -114,6 +114,15 @@
             </td>
           </tr>
         </ww:if>
+        <ww:else>
+          <tr>
+            <td>
+              <ww:if test="${empty allInstallations}">
+                <div class="warningmessage" style="color: red"><ww:text name="profile.no.installations"
/></div>
+              </ww:if>
+            </td>
+          </tr> 
+        </ww:else>
       </table>
     </div>
   </body>



Mime
View raw message