You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ct...@apache.org on 2008/09/29 04:30:08 UTC
svn commit: r699964 - in /continuum/trunk/continuum-webapp/src/main:
java/org/apache/maven/continuum/web/action/admin/ProfileAction.java
webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp
Author: ctan
Date: Sun Sep 28 19:30:07 2008
New Revision: 699964
URL: http://svn.apache.org/viewvc?rev=699964&view=rev
Log:
merge -r 699960:699962 from 1.2.x branch
[CONTINUUM-1857] [CONTINUUM-1881]
Modified:
continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java
continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java?rev=699964&r1=699963&r2=699964&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java Sun Sep 28 19:30:07 2008
@@ -116,7 +116,7 @@
{
Profile stored = profileService.getProfile( profile.getId() );
- if ( StringUtils.isEmpty( profile.getName() ) )
+ if ( StringUtils.isBlank( profile.getName() ) )
{
if ( stored != null )
{
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp?rev=699964&r1=699963&r2=699964&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp Sun Sep 28 19:30:07 2008
@@ -92,14 +92,19 @@
<ec:column property="deleteActions" title=" " width="1%">
<center>
<redback:ifAuthorized permission="continuum-modify-group" resource="${projectGroupName}">
- <ww:url id="removeUrl" action="removeGroupBuildDefinition" namespace="/">
- <ww:param name="projectGroupId">${pageScope.buildDefinitionSummary.projectGroupId}</ww:param>
- <ww:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</ww:param>
- <ww:param name="confirmed" value="false"/>
- </ww:url>
- <ww:a href="%{removeUrl}">
- <img src="<ww:url value='/images/delete.gif' includeParams="none"/>" alt="<ww:text name='delete'/>" title="<ww:text name='delete'/>" border="0">
- </ww:a>
+ <ww:if test="${pageScope.buildDefinitionSummary.isDefault == true}">
+ <img src="<ww:url value='/images/delete_disabled.gif' includeParams="none"/>" alt="<ww:text name='delete'/>" title="<ww:text name='delete'/>" border="0">
+ </ww:if>
+ <ww:else>
+ <ww:url id="removeUrl" action="removeGroupBuildDefinition" namespace="/">
+ <ww:param name="projectGroupId">${pageScope.buildDefinitionSummary.projectGroupId}</ww:param>
+ <ww:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</ww:param>
+ <ww:param name="confirmed" value="false"/>
+ </ww:url>
+ <ww:a href="%{removeUrl}">
+ <img src="<ww:url value='/images/delete.gif' includeParams="none"/>" alt="<ww:text name='delete'/>" title="<ww:text name='delete'/>" border="0">
+ </ww:a>
+ </ww:else>
</redback:ifAuthorized>
<redback:elseAuthorized>
<img src="<ww:url value='/images/delete_disabled.gif' includeParams="none"/>" alt="<ww:text name='delete'/>" title="<ww:text name='delete'/>" border="0">