Fix unexpected error when requesting to join group: https://bugzilla.…

…redhat.com/show_bug.cgi?id=998724
zanata · Aug 22, 2013 · 2185679 · 2185679
1 parent 21fe071
commit 2185679
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 35 deletions.
diff --git a/zanata-war/src/main/java/org/zanata/action/VersionGroupAction.java b/zanata-war/src/main/java/org/zanata/action/VersionGroupAction.java
@@ -159,7 +159,7 @@ public List<SelectableHProject> getSearchResults()
 
    public boolean isVersionInGroup(Long projectIterationId)
    {
-      return versionGroupServiceImpl.isVersionInGroup(group, projectIterationId);
+      return versionGroupServiceImpl.isVersionInGroup(group.getSlug(), projectIterationId);
    }
 
    @Transactional

diff --git a/zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java b/zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java
@@ -25,8 +25,10 @@
 import java.util.List;
 import java.util.Set;
 
-import org.apache.commons.lang.StringUtils;
+import lombok.Getter;
+import lombok.Setter;
 
+import org.apache.commons.lang.StringUtils;
 import org.jboss.seam.ScopeType;
 import org.jboss.seam.annotations.In;
 import org.jboss.seam.annotations.Logger;
@@ -69,10 +71,16 @@ public class VersionGroupJoinAction implements Serializable
 
    private HIterationGroup group;
 
+   @Getter
+   @Setter
    private String slug;
 
+   @Getter
+   @Setter
    private String iterationSlug;
 
+   @Getter
+   @Setter
    private String projectSlug;
 
    public void searchMaintainedProjectVersion()
@@ -111,7 +119,7 @@ public List<SelectableHProject> getProjectVersions()
 
    public boolean isVersionInGroup(Long projectIterationId)
    {
-      return versionGroupServiceImpl.isVersionInGroup(group, projectIterationId);
+      return versionGroupServiceImpl.isVersionInGroup(slug, projectIterationId);
    }
 
    public String cancel()
@@ -155,36 +163,6 @@ public HIterationGroup getGroup()
       return group;
    }
 
-   public String getSlug()
-   {
-      return slug;
-   }
-
-   public void setSlug(String slug)
-   {
-      this.slug = slug;
-   }
-
-   public String getIterationSlug()
-   {
-      return iterationSlug;
-   }
-
-   public void setIterationSlug(String iterationSlug)
-   {
-      this.iterationSlug = iterationSlug;
-   }
-
-   public String getProjectSlug()
-   {
-      return projectSlug;
-   }
-
-   public void setProjectSlug(String projectSlug)
-   {
-      this.projectSlug = projectSlug;
-   }
-
    public String getQuery()
    {
       StringBuilder queryBuilder = new StringBuilder();

diff --git a/zanata-war/src/main/java/org/zanata/service/VersionGroupService.java b/zanata-war/src/main/java/org/zanata/service/VersionGroupService.java
@@ -51,7 +51,7 @@ public interface VersionGroupService
 
    HProjectIteration getProjectIterationBySlug(String projectSlug, String iterationSlug);
 
-   boolean isVersionInGroup(HIterationGroup group, Long projectIterationId);
+   boolean isVersionInGroup(String groupSlug, Long projectIterationId);
 
    boolean isGroupInVersion(String groupSlug, Long id);
 

diff --git a/zanata-war/src/main/java/org/zanata/service/impl/VersionGroupServiceImpl.java b/zanata-war/src/main/java/org/zanata/service/impl/VersionGroupServiceImpl.java
@@ -157,8 +157,9 @@ public boolean leaveVersionGroup(String slug, Long projectIterationId)
    }
 
    @Override
-   public boolean isVersionInGroup(HIterationGroup group, Long projectIterationId)
+   public boolean isVersionInGroup(String groupSlug, Long projectIterationId)
    {
+      HIterationGroup group = getBySlug(groupSlug);
       if (group != null && projectIterationId != null)
       {
          for (HProjectIteration iteration : group.getProjectIterations())