From a626cb1c493778cadc486d76c109822844fb138b Mon Sep 17 00:00:00 2001 From: "Jevica Arianne B. Zurbano" Date: Tue, 13 Oct 2009 08:31:06 +0000 Subject: [PATCH] revert changes made in r809963 (CONTINUUM-2347) git-svn-id: https://svn.apache.org/repos/asf/continuum/branches/continuum-1.3.x@824635 13f79535-47bb-0310-9956-ffa450edef68 --- .../web/action/AddProjectAction.java | 9 +------ .../web/action/AddProjectActionTest.java | 24 ------------------- 2 files changed, 1 insertion(+), 32 deletions(-) diff --git a/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java b/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java index 6dda346caf..9b24cfc3ab 100644 --- a/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java +++ b/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java @@ -66,7 +66,7 @@ public class AddProjectAction private Collection projectGroups; - private static int selectedProjectGroup; + private int selectedProjectGroup; private String projectGroupName; @@ -144,11 +144,6 @@ public String add() addActionError( authzE.getMessage() ); return REQUIRES_AUTHORIZATION; } - - if ( this.getSelectedProjectGroup() == 0 ) - { - return INPUT; - } String projectNameTrim = projectName.trim(); String versionTrim = projectVersion.trim(); @@ -226,8 +221,6 @@ public String input() } projectGroups = new ArrayList(); - - selectedProjectGroup = 0; Collection allProjectGroups = getContinuum().getAllProjectGroups(); diff --git a/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/AddProjectActionTest.java b/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/AddProjectActionTest.java index 8eeab37421..e70b21881d 100644 --- a/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/AddProjectActionTest.java +++ b/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/AddProjectActionTest.java @@ -65,30 +65,6 @@ public void testAddProjectNullValues() action.validate(); } - /** - * Test add of project with no project groups available - * - * @throws Exception - */ - public void testAddProjectNoProjectGroups() - throws Exception - { - Collection projectGroups = new ArrayList(); - - String scmUrl = "scm:svn:http://project/scm/url/test/build.xml"; - action.setProjectGroups( projectGroups ); - - List projects = createProjectList(); - - action.setProjectName( "Ant Test Project" ); - action.setProjectVersion( "1.0-SNAPSHOT" ); - action.setProjectScmUrl( scmUrl ); - action.setProjectType( "ant" ); - action.setBuildDefintionTemplateId( 1 ); - - assertEquals( action.add(), "input" ); - } - /** * Test add of Ant project *