Changeset 6447

Timestamp:

Apr 15, 2014, 8:50:29 AM (9 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1802: Jobs should be shareable

Location:

trunk

Files:

• src/core/net/sf/basedb/core/Job.java (modified) (2 diffs)
• src/core/net/sf/basedb/core/Update.java (modified) (3 diffs)
• src/core/net/sf/basedb/core/data/JobData.java (modified) (1 diff)
• www/views/jobs/index.jsp (modified) (1 diff)
• www/views/jobs/list_jobs.jsp (modified) (6 diffs)

trunk/src/core/net/sf/basedb/core/Job.java

@@ -81 +81 @@
 @SuppressWarnings("deprecation")
 public class Job
-  extends OwnedItem<JobData>
-  implements Nameable, Removable, Transactional
+  extends CommonItem<JobData>
+  implements Transactional
 {
   /**
@@ -196 +196 @@
   {
     return TYPE;
-  }
-  // -------------------------------------------
-  /*
-    From the Nameable interface
-    -------------------------------------------
-  */
-  @Override
-  public String getName()
-  {
-    return getData().getName();
-  }
-  @Override
-  public void setName(String name)
-    throws PermissionDeniedException, InvalidDataException
-  {
-    checkPermission(Permission.WRITE);
-    NameableUtil.setName(getData(), name);
-  }
-  @Override
-  public String getDescription()
-  {
-    return getData().getDescription();
-  }
-  @Override
-  public void setDescription(String description)
-    throws PermissionDeniedException, InvalidDataException
-  {
-    checkPermission(Permission.WRITE);
-    NameableUtil.setDescription(getData(), description);
-  }
-  // -------------------------------------------
-  /*
-    From the Removable interface
-    -------------------------------------------
-  */
-  @Override
-  public boolean isRemoved()
-  {
-    return getData().isRemoved();
-  }
-  @Override
-  public void setRemoved(boolean removed)
-    throws PermissionDeniedException
-  {
-    checkPermission(removed ? Permission.DELETE : Permission.WRITE);
-    getData().setRemoved(removed);
   }
   // -------------------------------------------

trunk/src/core/net/sf/basedb/core/Update.java

@@ -40 +40 @@
 import org.hibernate.mapping.PersistentClass;
 import org.hibernate.mapping.Table;
+
 
 
@@ -76 +77 @@
 import net.sf.basedb.core.data.RoleKeyData;
 import net.sf.basedb.core.data.SchemaVersionData;
+import net.sf.basedb.core.data.ShareableData;
 import net.sf.basedb.core.data.UserData;
 import net.sf.basedb.core.dbengine.DbEngine;
@@ -212 +214 @@
     <td>116</td>
     <td>
-      Added {@link JobData#getExternalId()}. No special database update is needed. Only increase 
-      the schema version.
+      Added {@link JobData#getExternalId()} and made {@link JobData} a {@link ShareableData} item. 
+      No special database update is needed. Only increase the schema version.
     </td>
   </tr>

trunk/src/core/net/sf/basedb/core/data/JobData.java

@@ -40 +40 @@
 */
 public class JobData
-  extends OwnedData
-  implements NameableData, RemovableData
+  extends CommonData
 {
 
   public JobData()
   {}
-
-  /*
-    From the NameableData interface
-    -------------------------------------------
-  */
-  private String name;
-  @Override
-  public String getName()
-  {
-    return name;
-  }
-  @Override
-  public void setName(String name)
-  {
-    this.name = name;
-  }
-  private String description;
-  @Override
-  public String getDescription()
-  {
-    return description;
-  }
-  @Override
-  public void setDescription(String description)
-  {
-    this.description = description;
-  }
-  // -------------------------------------------
-  /*
-    From the RemovableData interface
-    -------------------------------------------
-  */
-  private boolean removed;
-  @Override
-  public boolean isRemoved()
-  {
-    return removed;
-  }
-  @Override
-  public void setRemoved(boolean removed)
-  {
-    this.removed = removed;
-  }
-  // -------------------------------------------
 
   private int type;

trunk/www/views/jobs/index.jsp

@@ -170 +170 @@
     redirect = listPage;
   }
+  else if ("ShareItem".equals(cmd))
+  {
+    // Display a popup window for sharing a single item
+    dc = sc.newDbControl();
+    ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, pageContext, defaultContext);
+    MultiPermissions permissions = ShareableUtil.getMultiPermissions(dc, itemType, Collections.singleton(cc.getId()));
+    dc.close();
+    cc.setObject("MultiPermissions", permissions);
+    redirect = "../../common/share/share.jsp?ID="+ID+"&item_type="+itemType.name();
+  }
+  else if ("ShareItems".equals(cmd))
+  {
+    // Display a popup window for sharing all selected items on the list page
+    dc = sc.newDbControl();
+    ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, pageContext, defaultContext);
+    MultiPermissions permissions = ShareableUtil.getMultiPermissions(dc, itemType, cc.getSelected());
+    dc.close();
+    cc.setObject("MultiPermissions", permissions);
+    redirect = "../../common/share/share.jsp?ID="+ID+"&item_type="+itemType.name();
+  }
   else if ("SetOwnerOfItem".equals(cmd))
   {

trunk/www/views/jobs/list_jobs.jsp

@@ -36 +36 @@
   import="net.sf.basedb.core.ItemContext"
   import="net.sf.basedb.core.Permission"
+  import="net.sf.basedb.core.Nameable"
   import="net.sf.basedb.core.PluginDefinition"
   import="net.sf.basedb.core.PermissionDeniedException"
@@ -45 +46 @@
   import="net.sf.basedb.core.plugin.Plugin"
   import="net.sf.basedb.util.Enumeration"
+  import="net.sf.basedb.util.ShareableUtil"
   import="net.sf.basedb.clients.web.Base"
   import="net.sf.basedb.clients.web.ModeInfo"
@@ -58 +60 @@
   import="net.sf.basedb.clients.web.extensions.list.ListColumnUtil"
   import="net.sf.basedb.util.extensions.ExtensionsInvoker"
+  import="java.util.Iterator"
   import="java.util.List"
   import="java.util.Map"
@@ -382 +385 @@
         title="Permission"
       />
+      <tbl:columndef
+        id="sharedTo"
+        title="Shared to"
+        filterable="true"
+        filterproperty="!sharedTo.name"
+        datatype="string"
+      />
       <tbl:columndef 
         id="xt-columns" 
@@ -403 +413 @@
             title="Restore" 
             tooltip="Restore the selected (deleted) items"
+          />
+          <tbl:button 
+            id="btnShareItems"
+            image="share.png"
+            title="Share&hellip;" 
+            tooltip="Share the selected items"
           />
           <tbl:button 
@@ -701 +717 @@
                   /></tbl:cell>
                 <tbl:cell column="permission"><%=PermissionUtil.getShortPermissions(item)%></tbl:cell>
+                <tbl:cell column="sharedTo">
+                  <%
+                  Iterator<Nameable> sharees = ShareableUtil.getSharedTo(dc, item).iterator();
+                  while(sharees.hasNext())
+                  {
+                    Nameable n = sharees.next();
+                    if (mode.hasPropertyLink())
+                    {
+                      out.write(Base.getLinkedName(ID, n, false, mode.hasEditLink()));
+                    }
+                    else
+                    {
+                      out.write(HTML.encodeTags(n.getName()));
+                    }
+                    out.write(sharees.hasNext() ? ", " : "");
+                  }
+                  %>
+                </tbl:cell>
                 <tbl:xt-cells dc="<%=dc%>" item="<%=item%>">
                   <tbl:cell column="xt-columns" />