Merge branch 'master' into rhbz788294

zanata · Mar 12, 2012 · 5e34fc5 · 5e34fc5
2 parents 8974d0a + e8afa8a
commit 5e34fc5
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 14 deletions.
diff --git a/server/zanata-model/src/main/java/org/zanata/model/HPerson.java b/server/zanata-model/src/main/java/org/zanata/model/HPerson.java
@@ -27,7 +27,6 @@
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
 import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
 import javax.persistence.ManyToMany;
 import javax.persistence.OneToMany;
 import javax.persistence.OneToOne;
@@ -103,8 +102,11 @@ public String getEmail()
       return email;
    }
 
-   @ManyToMany(fetch = FetchType.EAGER)
-   @JoinTable(name = "HProject_Maintainer", joinColumns = @JoinColumn(name = "personId"), inverseJoinColumns = @JoinColumn(name = "projectId"))
+   /*
+    * This is a read-only side of the relationship. Changes to this collection are allowed but will not
+    * be persisted.
+    */
+   @ManyToMany(fetch = FetchType.EAGER, mappedBy = "maintainers")
    public Set<HProject> getMaintainerProjects()
    {
       if (maintainerProjects == null)
@@ -213,10 +215,12 @@ public boolean isMaintainer(HProject proj)
    {
       // TODO consider implementing business key equality and using
       // getMaintainerProjects().contains(proj)
-      for (HProject maintProj : getMaintainerProjects())
+      for (HPerson maintainer : proj.getMaintainers())
       {
-         if (maintProj.getId().equals(proj.getId()))
+         if (maintainer.getId().equals( this.getId() ))
+         {
             return true;
+         }
       }
       return false;
    }

diff --git a/server/zanata-model/src/main/java/org/zanata/model/HProject.java b/server/zanata-model/src/main/java/org/zanata/model/HProject.java
@@ -112,6 +112,9 @@ public void setHomeContent(String homeContent)
       this.homeContent = homeContent;
    }
 
+   /**
+    * @see {@link #addMaintainer(HPerson)}
+    */
    @ManyToMany
    @JoinTable(name = "HProject_Maintainer", joinColumns = @JoinColumn(name = "projectId"), inverseJoinColumns = @JoinColumn(name = "personId"))
    //   @Cache(usage = CacheConcurrencyStrategy.READ_WRITE) // caching affects permission checks in security.drl
@@ -122,10 +125,19 @@ public Set<HPerson> getMaintainers()
       return maintainers;
    }
 
+   /**
+    * @see {@link #addMaintainer(HPerson)}
+    */
    public void setMaintainers(Set<HPerson> maintainers)
    {
       this.maintainers = maintainers;
    }
+
+   public void addMaintainer( HPerson maintainer )
+   {
+      this.getMaintainers().add(maintainer);
+      maintainer.getMaintainerProjects().add(this);
+   }
 
    @ManyToMany
    @JoinTable(name = "HProject_Locale", joinColumns = @JoinColumn(name = "projectId"), inverseJoinColumns = @JoinColumn(name = "localeId"))

diff --git a/server/zanata-war/src/main/java/org/zanata/action/ProjectHome.java b/server/zanata-war/src/main/java/org/zanata/action/ProjectHome.java
@@ -34,6 +34,7 @@
 import org.jboss.seam.annotations.In;
 import org.jboss.seam.annotations.Logger;
 import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Transactional;
 import org.jboss.seam.core.Events;
 import org.jboss.seam.faces.FacesMessages;
 import org.jboss.seam.log.Log;
@@ -44,7 +45,6 @@
 import org.zanata.model.HAccount;
 import org.zanata.model.HIterationProject;
 import org.zanata.model.HLocale;
-import org.zanata.model.HPerson;
 import org.zanata.model.HProjectIteration;
 import org.zanata.service.LocaleService;
 
@@ -129,6 +129,7 @@ public boolean isSlugAvailable(String slug)
    }
 
    @Override
+   @Transactional
    public String persist()
    {
       String retValue = "";
@@ -138,13 +139,9 @@ public String persist()
       if (authenticatedAccount != null)
       {
          updateOverrideLocales();
-         HPerson currentPerson = getEntityManager().find(HPerson.class, authenticatedAccount.getPerson().getId());
-         if (currentPerson != null)
-         {
-            getInstance().getMaintainers().add(currentPerson);
-            retValue = super.persist();
-            Events.instance().raiseEvent("projectAdded");
-         }
+         getInstance().addMaintainer(authenticatedAccount.getPerson());
+         retValue = super.persist();
+         Events.instance().raiseEvent("projectAdded");
       }
       return retValue;
    }

diff --git a/server/zanata-war/src/main/resources/security.drl b/server/zanata-war/src/main/resources/security.drl
@@ -66,7 +66,19 @@ end
 
 ******************************************************************************************/
 
-/* admin can create/delete projects (see rule AdminAnything above) */
+/* admin can delete projects (see rule AdminAnything above) */
+
+/* Any authenticated user can create a project */
+rule CreateProject
+  no-loop
+  activation-group "permissions"
+when
+  $project: HProject()
+  $authenticatedPerson: HPerson()
+  check: PermissionCheck(target == $project, action == "insert", granted == false )
+then
+  check.grant();
+end
 
 /* anyone can read a project */
 rule ReadProject