Return-Path: Delivered-To: apmail-maven-continuum-commits-archive@www.apache.org Received: (qmail 94749 invoked from network); 15 Dec 2006 16:14:14 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 15 Dec 2006 16:14:14 -0000 Received: (qmail 67340 invoked by uid 500); 15 Dec 2006 16:13:45 -0000 Delivered-To: apmail-maven-continuum-commits-archive@maven.apache.org Received: (qmail 67288 invoked by uid 500); 15 Dec 2006 16:13:45 -0000 Mailing-List: contact continuum-commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: continuum-dev@maven.apache.org Delivered-To: mailing list continuum-commits@maven.apache.org Received: (qmail 67213 invoked by uid 99); 15 Dec 2006 16:13:44 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Dec 2006 08:13:44 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Dec 2006 08:13:11 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 2EFFF1A981A; Fri, 15 Dec 2006 08:11:55 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r487588 - in /maven/continuum/trunk/continuum-webapp/src/main: java/org/apache/maven/continuum/web/action/BuildDefinitionAction.java webapp/WEB-INF/jsp/buildDefinitionEdit.jsp webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp Date: Fri, 15 Dec 2006 16:11:55 -0000 To: continuum-commits@maven.apache.org From: evenisse@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061215161155.2EFFF1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: evenisse Date: Fri Dec 15 08:11:54 2006 New Revision: 487588 URL: http://svn.apache.org/viewvc?view=rev&rev=487588 Log: Fix group build definition edition in project view Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionAction.java maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildDefinitionEdit.jsp maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionAction.java URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionAction.java?view=diff&rev=487588&r1=487587&r2=487588 ============================================================================== --- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionAction.java (original) +++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionAction.java Fri Dec 15 08:11:54 2006 @@ -66,6 +66,8 @@ private Map profiles; + private boolean groupBuildDefinition = false; + public void prepare() throws Exception { @@ -137,7 +139,7 @@ public String saveBuildDefinition() throws ContinuumException { - if (projectId != 0) + if ( projectId != 0 && !groupBuildDefinition ) { return saveToProject(); } @@ -198,7 +200,14 @@ return INPUT; } - return "success_group"; + if ( projectId != 0 ) + { + return SUCCESS; + } + else + { + return "success_group"; + } } public String removeFromProject() @@ -391,5 +400,15 @@ public void setProfiles( Map profiles ) { this.profiles = profiles; + } + + public boolean isGroupBuildDefinition() + { + return groupBuildDefinition; + } + + public void setGroupBuildDefinition( boolean groupBuildDefinition ) + { + this.groupBuildDefinition = groupBuildDefinition; } } Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildDefinitionEdit.jsp URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildDefinitionEdit.jsp?view=diff&rev=487588&r1=487587&r2=487588 ============================================================================== --- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildDefinitionEdit.jsp (original) +++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildDefinitionEdit.jsp Fri Dec 15 08:11:54 2006 @@ -27,6 +27,7 @@ + Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp?view=diff&rev=487588&r1=487587&r2=487588 ============================================================================== --- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp (original) +++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp Fri Dec 15 08:11:54 2006 @@ -44,13 +44,15 @@ ${pageScope.buildDefinitionSummary.projectGroupId} ${pageScope.buildDefinitionSummary.id} + true <ww:text name='edit'/> - + ${pageScope.buildDefinitionSummary.projectGroupId} ${pageScope.buildDefinitionSummary.id} + true <ww:text name='delete'/>