Changeset 5964

Timestamp:

Feb 15, 2012, 2:59:24 PM (12 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1614: Add option in edit dialog to add new items as project default items

Location:

trunk

Files:

• doc/test/roles/index.html (modified) (5 diffs)
• src/core/net/sf/basedb/core/Keyring.java (modified) (1 diff)
• src/core/net/sf/basedb/core/SessionControl.java (modified) (1 diff)
• www/admin/hardware/edit_hardware.jsp (modified) (1 diff)
• www/admin/hardware/index.jsp (modified) (2 diffs)
• www/admin/protocols/edit_protocol.jsp (modified) (1 diff)
• www/admin/protocols/index.jsp (modified) (2 diffs)
• www/admin/software/edit_software.jsp (modified) (1 diff)
• www/admin/software/index.jsp (modified) (2 diffs)
• www/lims/arraydesigns/edit_design.jsp (modified) (1 diff)
• www/lims/arraydesigns/index.jsp (modified) (2 diffs)

trunk/doc/test/roles/index.html

@@ -593 +593 @@
   
   <li>
-    Create protocols:
+    Create protocols (keep the 'Set as project default' option checked):
     <table class="listing" cellspacing="0" cellpadding="2" border="0">
     <tr>
@@ -654 +654 @@
 
   <li>
-    Create hardware:
+    Create hardware (keep the 'Set as project default' option checked):
     <table class="listing" cellspacing="0" cellpadding="2" border="0">
     <tr>
@@ -685 +685 @@
   
   <li>
-    Create software:
+    Create software (keep the 'Set as project default' option checked):
     <table class="listing" cellspacing="0" cellpadding="2" border="0">
     <tr>
@@ -1256 +1256 @@
 
   <li>
-    Create array designs and upload data files to them:
+    Create array designs and upload data files to them.  Keep the 'Set as project default' option checked
+    if doing this manually.
     <table class="listing" cellspacing="0" cellpadding="2" border="0">
     <tr>
@@ -1327 +1328 @@
     Set project defaults. Go to the projects page and edit the 
     <code>Project A</code> project. On the <code>Defaults</code>
-    tab, set the following defaults:
+    tab, set the following defaults. NOTE! Most of the items in this
+    list should already be registered as default items if the
+    'Set as project default' option was used when creating the new items.
     
     <table class="listing" cellspacing="0" cellpadding="2" border="0">

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

@@ -748 +748 @@
 
   /**
+    Get the max project permission within the currently active project.
+  */
+  int getMaxProjectPermission()
+  {
+    return maxProjectPermission;
+  }
+  
+  /**
     Set the active project.
     @param projectData The project to make active, or null to

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

@@ -894 +894 @@
   
   /**
+    Get the permissions that the logged in user has in the currently active project.
+    @return A Set with the permissions
+    @since 3.1
+  */
+  public Set<Permission> getActiveProjectPermissions()
+  {
+    return Permission.fromInt(loginInfo == null ? 0 : loginInfo.keyring.getMaxProjectPermission());
+  }
+  
+
+  
+  /**
     Create a new session control for executing a plugin.
     @param plugin The plugin to execute

trunk/www/admin/hardware/edit_hardware.jsp

@@ -217 +217 @@
         </td>
       </tr>
+      <%
+      if (sc.getActiveProjectId() != 0 && hardware == null && sc.getActiveProjectPermissions().contains(Permission.WRITE))
+      {
+        %>
+        <tr>
+          <th></th>
+          <td>
+            <input type="checkbox" id="setAsProjectDefault" name="setAsProjectDefault" value="1" 
+              checked><label for="setAsProjectDefault">Set as project default</label>
+          </td>
+          <td></td>
+        </tr>
+        <%
+      }
+      %>
       </table>
     </t:tab>

trunk/www/admin/hardware/index.jsp

@@ -30 +30 @@
   import="net.sf.basedb.core.Include"
   import="net.sf.basedb.core.Hardware"
+  import="net.sf.basedb.core.Project"
   import="net.sf.basedb.core.ItemSubtype"
   import="net.sf.basedb.core.ItemQuery"
@@ -140 +141 @@
       message = "Hardware created";
       dc.saveItem(hardware);
+      if (Values.getBoolean("setAsProjectDefault"))
+      {
+        Project.getById(dc, sc.getActiveProjectId()).addDefaultItem(hardware);
+      }
     }
     else

trunk/www/admin/protocols/edit_protocol.jsp

@@ -341 +341 @@
         </td>
       </tr>
+      <%
+      if (sc.getActiveProjectId() != 0 && protocol == null && sc.getActiveProjectPermissions().contains(Permission.WRITE))
+      {
+        %>
+        <tr>
+          <th></th>
+          <td>
+            <input type="checkbox" id="setAsProjectDefault" name="setAsProjectDefault" value="1" 
+              checked><label for="setAsProjectDefault">Set as project default</label>
+          </td>
+          <td></td>
+        </tr>
+        <%
+      }
+      %>
       </table>
     </t:tab>

trunk/www/admin/protocols/index.jsp

@@ -30 +30 @@
   import="net.sf.basedb.core.Include"
   import="net.sf.basedb.core.Protocol"
+  import="net.sf.basedb.core.Project"
   import="net.sf.basedb.core.ItemSubtype"
   import="net.sf.basedb.core.AnnotationType"
@@ -142 +143 @@
       message = "Protocol created";
       dc.saveItem(protocol);
+      if (Values.getBoolean("setAsProjectDefault"))
+      {
+        Project.getById(dc, sc.getActiveProjectId()).addDefaultItem(protocol);
+      }
     }
     else

trunk/www/admin/software/edit_software.jsp

@@ -218 +218 @@
         </td>
       </tr>
+      <%
+      if (sc.getActiveProjectId() != 0 && software == null && sc.getActiveProjectPermissions().contains(Permission.WRITE))
+      {
+        %>
+        <tr>
+          <th></th>
+          <td>
+            <input type="checkbox" id="setAsProjectDefault" name="setAsProjectDefault" value="1" 
+              checked><label for="setAsProjectDefault">Set as project default</label>
+          </td>
+          <td></td>
+        </tr>
+        <%
+      }
+      %>
       </table>
     </t:tab>

trunk/www/admin/software/index.jsp

@@ -30 +30 @@
   import="net.sf.basedb.core.Include"
   import="net.sf.basedb.core.Software"
+  import="net.sf.basedb.core.Project"
   import="net.sf.basedb.core.ItemSubtype"
   import="net.sf.basedb.core.ItemQuery"
@@ -139 +140 @@
       software = Software.getNew(dc);
       message = "Software created";
+      if (Values.getBoolean("setAsProjectDefault"))
+      {
+        Project.getById(dc, sc.getActiveProjectId()).addDefaultItem(software);
+      }
       dc.saveItem(software);
     }

trunk/www/lims/arraydesigns/edit_design.jsp

@@ -348 +348 @@
         </td>
       </tr>
+      <%
+      if (sc.getActiveProjectId() != 0 && design == null && sc.getActiveProjectPermissions().contains(Permission.WRITE))
+      {
+        %>
+        <tr>
+          <th></th>
+          <td>
+            <input type="checkbox" id="setAsProjectDefault" name="setAsProjectDefault" value="1" 
+              checked><label for="setAsProjectDefault">Set as project default</label>
+          </td>
+          <td></td>
+        </tr>
+        <%
+      }
+      %>
       </table>
     </t:tab>

trunk/www/lims/arraydesigns/index.jsp

@@ -32 +32 @@
   import="net.sf.basedb.core.ArrayBatch"
   import="net.sf.basedb.core.ArrayDesign"
+  import="net.sf.basedb.core.Project"
   import="net.sf.basedb.core.Platform"
   import="net.sf.basedb.core.PlatformVariant"
@@ -184 +185 @@
       message = "Array design created";
       dc.saveItem(design);
+      if (Values.getBoolean("setAsProjectDefault"))
+      {
+        Project.getById(dc, sc.getActiveProjectId()).addDefaultItem(design);
+      }
     }
     else