Change slug validation message into class related:

zanata · Jun 4, 2012 · 0cae6df · 0cae6df
1 parent e2395c2
commit 0cae6df
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 15 deletions.
diff --git a/zanata-war/src/main/java/org/zanata/action/ProjectHome.java b/zanata-war/src/main/java/org/zanata/action/ProjectHome.java
@@ -112,7 +112,7 @@ public boolean validateSlug(String slug, String componentId)
    {
       if (!isSlugAvailable(slug))
       {
-         FacesMessages.instance().addToControl(componentId, "This slug is not available");
+         FacesMessages.instance().addToControl(componentId, "This Project ID is not available");
          return false;
       }
       return true;

diff --git a/zanata-war/src/main/java/org/zanata/action/ProjectIterationHome.java b/zanata-war/src/main/java/org/zanata/action/ProjectIterationHome.java
@@ -25,7 +25,6 @@
 
 import javax.faces.event.ValueChangeEvent;
 import javax.persistence.EntityNotFoundException;
-import javax.persistence.NoResultException;
 
 import org.hibernate.criterion.NaturalIdentifier;
 import org.hibernate.criterion.Restrictions;
@@ -124,7 +123,7 @@ public boolean validateSlug(String slug, String componentId)
    {
       if (!isSlugAvailable(slug))
       {
-         FacesMessages.instance().addToControl(componentId, "This slug is not available");
+         FacesMessages.instance().addToControl(componentId, "This Version ID is not available");
          return false;
       }
       return true;

diff --git a/zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java b/zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java
@@ -25,7 +25,6 @@
 
 import javax.faces.event.ValueChangeEvent;
 import javax.faces.model.SelectItem;
-import javax.persistence.NoResultException;
 
 import org.hibernate.Session;
 import org.hibernate.criterion.NaturalIdentifier;
@@ -38,6 +37,7 @@
 import org.zanata.model.HAccount;
 import org.zanata.model.HIterationGroup;
 import org.zanata.model.HProjectIteration;
+import org.zanata.service.SlugEntityService;
 
 /**
  * @author Alex Eng <a href="mailto:aeng@redhat.com">aeng@redhat.com</a>
@@ -53,6 +53,9 @@ public class VersionGroupHome extends SlugHome<HIterationGroup>
    @In(required = false, value = JpaIdentityStore.AUTHENTICATED_USER)
    HAccount authenticatedAccount;
 
+   @In
+   SlugEntityService slugEntityServiceImpl;
+
    @Override
    protected HIterationGroup loadInstance()
    {
@@ -110,24 +113,15 @@ public boolean validateSlug(String slug, String componentId)
    {
       if (!isSlugAvailable(slug))
       {
-         FacesMessages.instance().addToControl(componentId, "This slug is not available");
+         FacesMessages.instance().addToControl(componentId, "This Group ID is not available");
          return false;
       }
       return true;
    }
 
    public boolean isSlugAvailable(String slug)
    {
-      try
-      {
-         getEntityManager().createQuery("from HIterationGroup g where g.slug = :slug").setParameter("slug", slug).getSingleResult();
-         return false;
-      }
-      catch (NoResultException e)
-      {
-         // pass
-      }
-      return true;
+      return slugEntityServiceImpl.isSlugAvailable(slug, HIterationGroup.class);
    }
 
    @Override