Return-Path: X-Original-To: apmail-continuum-commits-archive@www.apache.org Delivered-To: apmail-continuum-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6FA8F1E03 for ; Wed, 27 Apr 2011 01:02:46 +0000 (UTC) Received: (qmail 38252 invoked by uid 500); 27 Apr 2011 01:02:46 -0000 Delivered-To: apmail-continuum-commits-archive@continuum.apache.org Received: (qmail 38209 invoked by uid 500); 27 Apr 2011 01:02:46 -0000 Mailing-List: contact commits-help@continuum.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@continuum.apache.org Delivered-To: mailing list commits@continuum.apache.org Received: (qmail 38202 invoked by uid 99); 27 Apr 2011 01:02:45 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 27 Apr 2011 01:02:45 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 27 Apr 2011 01:02:44 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 8084C2388962; Wed, 27 Apr 2011 01:02:24 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1096976 - in /continuum/trunk: continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ continuum-webapp/src/main/webapp/WEB-INF/jsp/components/ Date: Wed, 27 Apr 2011 01:02:24 -0000 To: commits@continuum.apache.org From: ctan@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110427010224.8084C2388962@eris.apache.org> Author: ctan Date: Wed Apr 27 01:02:24 2011 New Revision: 1096976 URL: http://svn.apache.org/viewvc?rev=1096976&view=rev Log: fixed 'invalid project group id' when deleting a project Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/MavenOneProjectTest.java continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/MavenTwoProjectTest.java continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteProjectAction.java continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectSummaryComponent.jsp Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/MavenOneProjectTest.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/MavenOneProjectTest.java?rev=1096976&r1=1096975&r2=1096976&view=diff ============================================================================== --- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/MavenOneProjectTest.java (original) +++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/MavenOneProjectTest.java Wed Apr 27 01:02:24 2011 @@ -199,12 +199,12 @@ public class MavenOneProjectTest clickLinkWithXPath( "//tbody/tr['0']/td['10']/a/img[@alt='Delete']" ); assertTextPresent( "Delete Continuum Project" ); clickButtonWithValue( "Delete" ); - assertProjectGroupsSummaryPage(); - clickLinkWithText( M1_PROJ_GRP_NAME ); + assertPage( "Continuum - Project Group" ); + assertLinkNotPresent( M1_PROJ_GRP_NAME ); // remove group for next test removeProjectGroup( M1_PROJ_GRP_NAME ); - /* + // delete project - "Delete Project(s)" button addMaven1Project( M1_PROJ_GRP_NAME ); clickLinkWithText( M1_PROJ_GRP_NAME ); @@ -218,7 +218,7 @@ public class MavenOneProjectTest if ( !isExisting ) { removeProjectGroup( M1_PROJ_GRP_NAME ); - }*/ + } } private void addMaven1Project( String groupName ) Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/MavenTwoProjectTest.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/MavenTwoProjectTest.java?rev=1096976&r1=1096975&r2=1096976&view=diff ============================================================================== --- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/MavenTwoProjectTest.java (original) +++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/MavenTwoProjectTest.java Wed Apr 27 01:02:24 2011 @@ -244,14 +244,15 @@ public class MavenTwoProjectTest clickLinkWithXPath( "//tbody/tr['0']/td['10']/a/img[@alt='Delete']" ); assertTextPresent( "Delete Continuum Project" ); clickButtonWithValue( "Delete" ); - assertProjectGroupsSummaryPage(); + assertPage( "Continuum - Project Group" ); + assertTextNotPresent( "Unable to delete project" ); assertLinkNotPresent( M2_PROJ_GRP_NAME ); assertTextNotPresent( M2_PROJ_GRP_SCM_ROOT_URL ); // remove group for next test removeProjectGroup( M2_PROJ_GRP_NAME ); assertLinkNotPresent( M2_PROJ_GRP_NAME ); -/* + // delete project - "Delete Project(s)" button addMaven2Project( M2_PROJ_GRP_NAME ); clickLinkWithText( M2_PROJ_GRP_NAME ); @@ -271,7 +272,7 @@ public class MavenTwoProjectTest // remove project group removeProjectGroup( M2_PROJ_GRP_NAME ); - assertLinkNotPresent( M2_PROJ_GRP_NAME );*/ + assertLinkNotPresent( M2_PROJ_GRP_NAME ); } public void testBuildProjectGroupNoBuildAgentConfigured() Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteProjectAction.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteProjectAction.java?rev=1096976&r1=1096975&r2=1096976&view=diff ============================================================================== --- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteProjectAction.java (original) +++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteProjectAction.java Wed Apr 27 01:02:24 2011 @@ -23,6 +23,7 @@ import org.apache.continuum.web.util.Aud import org.apache.continuum.web.util.AuditLogConstants; import org.apache.maven.continuum.ContinuumException; import org.apache.maven.continuum.model.project.Project; +import org.apache.maven.continuum.model.project.ProjectGroup; import org.apache.maven.continuum.web.exception.AuthorizationRequiredException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -135,7 +136,9 @@ public class DeleteProjectAction } else { - projectGroupName = getContinuum().getProjectGroupByProjectId( projectId ).getName(); + ProjectGroup group = getContinuum().getProjectGroupByProjectId( projectId ); + projectGroupName = group.getName(); + projectGroupId = group.getId(); } } Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectSummaryComponent.jsp URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectSummaryComponent.jsp?rev=1096976&r1=1096975&r2=1096976&view=diff ============================================================================== --- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectSummaryComponent.jsp (original) +++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectSummaryComponent.jsp Wed Apr 27 01:02:24 2011 @@ -45,6 +45,7 @@
+ -