Changeset 5877

Timestamp:

Nov 16, 2011, 3:39:47 PM (11 years ago)

Author:

Nicklas Nordborg

Message:

References #1616: Clone reporter information to per-experiment tables in the dynamic database

Added gui for defining reporter clone templates. Changes to the batcher API. Added an API (TransactionalAction) for hooking into transaction commit/rollback.

Location:

trunk

Files:

• src/clients/web/net/sf/basedb/clients/web/PermissionUtil.java (modified) (1 diff)
• src/clients/web/net/sf/basedb/clients/web/extensions/edit/EditUtil.java (modified) (1 diff)
• src/clients/web/net/sf/basedb/clients/web/extensions/toolbar/ToolbarUtil.java (modified) (1 diff)
• src/clients/web/net/sf/basedb/clients/web/resources/common.properties (modified) (1 diff)
• src/clients/web/net/sf/basedb/clients/web/resources/menu.properties (modified) (1 diff)
• src/core/net/sf/basedb/core/ClonedProperty.java (modified) (10 diffs)
• src/core/net/sf/basedb/core/DbControl.java (modified) (6 diffs)
• src/core/net/sf/basedb/core/DropDynamicTableAction.java (added)
• src/core/net/sf/basedb/core/Experiment.java (modified) (2 diffs)
• src/core/net/sf/basedb/core/Install.java (modified) (1 diff)
• src/core/net/sf/basedb/core/ReporterCloneBatcher.java (modified) (8 diffs)
• src/core/net/sf/basedb/core/ReporterCloneTemplate.java (modified) (4 diffs)
• src/core/net/sf/basedb/core/TransactionalAction.java (added)
• src/core/net/sf/basedb/core/data/ReporterClonePropertyData.java (modified) (1 diff)
• src/core/net/sf/basedb/core/data/ReporterCloneTemplateData.java (modified) (1 diff)
• src/test/TestReporterCloneTemplate.java (modified) (4 diffs)
• www/admin/reporterclonetemplates (added)
• www/admin/reporterclonetemplates/edit_template.jsp (added)
• www/admin/reporterclonetemplates/index.jsp (added)
• www/admin/reporterclonetemplates/list_templates.jsp (added)
• www/admin/reporterclonetemplates/view_template.jsp (added)
• www/include/menu.jsp (modified) (3 diffs)
• www/include/scripts/main.js (modified) (1 diff)
• www/views/experiments/list_experiments.jsp (modified) (2 diffs)
• www/views/experiments/view_experiment.jsp (modified) (1 diff)

trunk/src/clients/web/net/sf/basedb/clients/web/PermissionUtil.java

@@ -187 +187 @@
         {
           Item.PROTOCOL, Item.HARDWARE, Item.SOFTWARE,
-          Item.ANNOTATIONTYPE, Item.ANNOTATIONTYPECATEGORY, Item.MIMETYPE, Item.REPORTER, 
-          Item.REPORTERLIST, Item.REPORTERTYPE, Item.EXTRAVALUETYPE, Item.ITEMSUBTYPE,
+          Item.ANNOTATIONTYPE, Item.ANNOTATIONTYPECATEGORY, Item.MIMETYPE, 
+          Item.REPORTER, Item.REPORTERLIST, Item.REPORTERTYPE, Item.REPORTERCLONETEMPLATE, 
+          Item.EXTRAVALUETYPE, Item.ITEMSUBTYPE,
           Item.PLATFORM, Item.DATAFILETYPE, Item.QUANTITY, Item.UNIT
         })

trunk/src/clients/web/net/sf/basedb/clients/web/extensions/edit/EditUtil.java

@@ -64 +64 @@
       Item.DIRECTORY, Item.FILE, Item.FILESERVER, Item.PROJECT, Item.PERMISSIONTEMPLATE,
       Item.PHYSICALBIOASSAY, Item.DERIVEDBIOASSAY, Item.RAWBIOASSAY, 
-      Item.FORMULA, Item.REPORTER, Item.REPORTERLIST,
+      Item.FORMULA, Item.REPORTER, Item.REPORTERLIST, Item.REPORTERCLONETEMPLATE,
       Item.EXPERIMENT, Item.TRANSFORMATION, Item.BIOASSAYSET, Item.BIOASSAY,
       Item.USER, Item.GROUP, Item.ROLE, Item.QUOTA, Item.SOFTWARE, Item.HARDWARE,

trunk/src/clients/web/net/sf/basedb/clients/web/extensions/toolbar/ToolbarUtil.java

@@ -59 +59 @@
       Item.TRANSFORMATION, Item.EXTRAVALUE, Item.SPOTDATA,
       Item.RAWBIOASSAY, Item.RAWDATA, Item.FORMULA,
-      Item.REPORTER, Item.REPORTERLIST, Item.REPORTERSCORE,
+      Item.REPORTER, Item.REPORTERLIST, Item.REPORTERSCORE, Item.REPORTERCLONETEMPLATE,
       Item.DERIVEDBIOASSAY, Item.PHYSICALBIOASSAY,
       Item.BIOSOURCE, Item.SAMPLE, Item.EXTRACT, 

trunk/src/clients/web/net/sf/basedb/clients/web/resources/common.properties

@@ -156 +156 @@
 item.news News
 item.news+  News
+item.reporterclonetemplate    Reporter clone template
+item.reporterclonetemplate+ Reporter clone templates
 item.diskusage  Disk usage
 item.diskusage+ Disk usage

trunk/src/clients/web/net/sf/basedb/clients/web/resources/menu.properties

@@ -167 +167 @@
 news.tooltip.1  Administrate news
 news.tooltip.0  You do not have permission to administrate news
+reporterclonetemplates.tooltip.1  Administrate reporter clone templates
+reporterclonetemplates.tooltip.0  You do not have permission to administrate reporter clone templates
 # ------------
 diskusage.tooltip.1 Check disk usage

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

@@ -21 +21 @@
 */
 package net.sf.basedb.core;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 
 import net.sf.basedb.core.Formula.AverageMethod;
@@ -38 +42 @@
 public class ClonedProperty
   extends ExtendedProperty
+  implements Comparable<ClonedProperty>
 {
   /**
@@ -66 +71 @@
         Type.STRING, ReporterData.MAX_NAME_LENGTH, false, AverageMethod.NONE);
     }
-    if (SYMBOL.equals(name))
+    else if (SYMBOL.equals(name))
     {
       property = new ClonedProperty(SYMBOL, "Symbol", "", "symbol", 
@@ -79 +84 @@
   
   /**
-    Create a cloned property reprsentation of an extended property.
+    Create a cloned property representation of an extended property.
     @param name The name of the extended property
     @return A cloned property view of the extended property
@@ -95 +100 @@
   }
   
+  /**
+    Create a cloned property from either an extended or static property.
+    This method will first check if an extended property with the given
+    name exists. 
+    @param name The name of the property
+    @return A cloned property view of the extended or static property
+    @throws ItemNotFoundException If a property with the given name
+      doesn't exist
+  */
+  public static ClonedProperty create(String name)
+  {
+    ClonedProperty property = null;
+    ExtendedProperty ep = ExtendedProperties.getProperty("ReporterData", name);
+    if (ep == null)
+    {
+      property = createFromRegular(name);
+    }
+    else
+    {
+      property = new ClonedProperty(ep);
+    }
+    return property;
+  }
+  
+  /**
+    Get a list containing cloned property representation for all static and 
+    extended properties.
+  */
+  public static List<ClonedProperty> getAll()
+  {
+    List<ExtendedProperty> extended = ExtendedProperties.getProperties("ReporterData");
+    List<ClonedProperty> all = new ArrayList<ClonedProperty>(extended.size() + 2);
+    
+    for (ExtendedProperty ep : extended)
+    {
+      all.add(new ClonedProperty(ep));
+    }
+    all.add(createFromRegular(NAME));
+    all.add(createFromRegular(SYMBOL));
+    Collections.sort(all);
+    return all;
+  }
+  
+  private final boolean isExtendedProperty;
+  
+  /**
+    Create a cloned property representation of a static property.
+  */
   private ClonedProperty(String propertyName, String title, String description,
       String column, Type valueType, int length, boolean nullable, AverageMethod averageMethod)
@@ -101 +154 @@
       valueType, length, nullable, true, true, 
       averageMethod, null);
+    this.isExtendedProperty = false;
   }
   
@@ -112 +166 @@
       p.getType(), p.getLength(), p.isNullable(), true, true, 
       p.getAverageMethod(), null);
+    this.isExtendedProperty = true;
   }
   
@@ -125 +180 @@
       Type.fromValue(d.getValueType()), d.getLength(), d.isNullable(), true, true,
       AverageMethod.fromValue(d.getAverageMethod()), null);
+    this.isExtendedProperty = d.isExtendedProperty();
   }
   
@@ -140 +196 @@
     data.setNullable(isNullable());
     data.setAverageMethod(getAverageMethod().getValue());
+    data.setExtendedProperty(isExtendedProperty());
     return data;
   }
 
+  /**
+    Is this cloned property an extended property or a "static" property?
+  */
+  public boolean isExtendedProperty()
+  {
+    return isExtendedProperty;
+  }
+  
+  /**
+    Check if this cloned property still exists. A cloned property that
+    has been added to a template is not automatically removed if the
+    extended properties configuration is changed.
+  */
+  public boolean exists()
+  {
+    return !isExtendedProperty() || ExtendedProperties.getProperty("ReporterData", getName()) != null;
+  }
+  
+  /*
+    From the Object class
+    ---------------------
+  */
   @Override
   public String toString()
@@ -148 +227 @@
     return getName();
   }
-  
+
+  @Override
+  public boolean equals(Object o)
+  {
+    if (this == o) return true;
+    if (o == null) return false;
+    if (o.getClass() != ClonedProperty.class) return false;
+    ClonedProperty other = (ClonedProperty)o;
+    return getName().equals(other.getName());
+  }
+  
+  @Override
+  public int hashCode()
+  {
+    return getName().hashCode();
+  }
+  // ---------------------
+  /*
+    From the Comparable interface
+    -----------------------------
+  */
+  @Override
+  public int compareTo(ClonedProperty o)
+  {
+    return getName().compareTo(o.getName());
+  }
+  // -----------------------------
 }

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

@@ -120 +120 @@
   
   /**
+    List of actions that should be performed when the
+    transaction commits or rollbacks.
+  */
+  private List<TransactionalAction> transactionalActions;
+  
+  /**
     Is the connection closed or not?
   */
@@ -317 +323 @@
     hTransaction = null;
 
+    // Call TransactionalAction.onRollback()
+    if (transactionalActions != null)
+    {
+      for (TransactionalAction action : transactionalActions)
+      {
+        try
+        {
+          action.onRollback();
+        }
+        catch (RuntimeException ex)
+        {
+          log.warn("Action failed: " + action, ex);
+        }
+      }
+    }
     for (Map.Entry<BasicItem,Transactional.Action> entry : commitQueue.entrySet())
     {
@@ -334 +355 @@
     if (batchers != null) batchers.clear();
     if (saveIfQueue != null) saveIfQueue.clear();
+    if (transactionalActions != null) transactionalActions.clear();
     saveIfQueue = null;
     commitQueue = null;
+    transactionalActions = null;
     itemCache = null;
     batchers = null;
     isClosed = true;
     isConnected = false;
+  }
+  
+  /**
+    Add a transactional action to this DbControl.
+    @since 3.1
+  */
+  public void addTransactionalAction(TransactionalAction action)
+  {
+    if (transactionalActions == null)
+    {
+      transactionalActions = new ArrayList<TransactionalAction>();
+    }
+    transactionalActions.add(action);
   }
   
@@ -436 +472 @@
         }
       }
+      // Call TransactionalAction.onBeforeCommit()
+      if (transactionalActions != null)
+      {
+        for (TransactionalAction action : transactionalActions)
+        {
+          action.onBeforeCommit();
+        }
+      }
       HibernateUtil.commit(hTransaction);
       HibernateUtil.close(hSession);
@@ -442 +486 @@
       hTransaction = null;
     }
-    catch (BaseException ex)
+    catch (RuntimeException ex)
     {
       if (afterCommitQueue != null) commitQueue.putAll(afterCommitQueue);
@@ -448 +492 @@
       close();
       throw ex;
+    }
+    // Call TransactionalAction.onAfterCommit()
+    if (transactionalActions != null)
+    {
+      for (TransactionalAction action : transactionalActions)
+      {
+        try
+        {
+          action.onAfterCommit();
+        }
+        catch (RuntimeException ex)
+        {
+          log.warn("Action failed: " + action, ex);
+        }
+      }
     }
     cleanUp();

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

@@ -25 +25 @@
 
 import net.sf.basedb.core.data.ExperimentData;
-import net.sf.basedb.core.data.ReporterCloneTemplateData;
 import net.sf.basedb.core.hibernate.TypeWrapper;
 import net.sf.basedb.core.query.Restrictions;
@@ -803 +802 @@
   }
   
-  /**
-    Create a reporter clone table in the dynamic database for this
-    experiment and populate it with the current reporter annotations
-    for all reporters that are part of the experiment. This method will
-    create an immutable copy of the template so that we can always know
-    which fields that have been cloned, even if the template is modified.
+  private ReporterCloneBatcher reporterCloneBatcher;
+  
+  /**
+    Get a batcher for managing cloned reporter information for this experiment.
+    Note that multiple calls to this method will return the same batcher instance.
     
-    @param dc A DbControl to use for database access
-    @param template The template that decides which fieds that
-      are cloned
-    @param progress An optional progress reporter
-    @return The number of reporters that was cloned
+    @param dc The DbControl to use for database access
+    @return A reporter clone batcher
     @since 3.1
   */
-  public int cloneReporters(DbControl dc, ReporterCloneTemplate template, ProgressReporter progress)
-  {
-    VirtualDb db = VirtualDb.getById(dc, getData().getVirtualDb().getId());
-    
-    if (db.hasClonedReporters())
+  public ReporterCloneBatcher getReporterCloneBatcher(DbControl dc)
+  {
+    if (reporterCloneBatcher == null)
     {
-      // Remove existing clone table
-      oldReporterCloneTable = VirtualTable.CLONED_REPORTERS.getTableName(db);
-      ReporterCloneTemplateData oldClone = db.getData().getReporterCloneTemplate();
-      HibernateUtil.deleteData(dc.getHibernateSession(), oldClone);
-      this.addBytes(-oldClone.getBytes());
+      reporterCloneBatcher = new ReporterCloneBatcher(dc, this);
     }
-    
-    if (progress != null) progress.display(0, "Creating clone table...");
-    // Create a copy of the template
-    ReporterCloneTemplateData copy = template.createLockedCopy();
-    db.getData().setReporterCloneTemplate(copy);
-    HibernateUtil.saveData(dc.getHibernateSession(), copy);
-    
-    // Create a new clone table
-    newReporterCloneTable = HibernateUtil.createVirtualTable(db, VirtualTable.CLONED_REPORTERS);
-    
-    // Clone reporter information
-    return new ReporterCloneBatcher(dc, this).cloneReporters(progress);
-  }
-  
+    return reporterCloneBatcher;
+  }
   
   /**

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

@@ -362 +362 @@
       createRoleKey(Item.REPORTER, "Reporters", "Gives access to reporter", guests_use_administrators_all);
       createRoleKey(Item.REPORTERLIST, "Reporter lists", "Gives access to reporter lists", users_create);
-      createRoleKey(Item.REPORTERCLONETEMPLATE, "Reporter clone template", "Gives access to reporter clone templates", guests_use_power_users_all);
+      createRoleKey(Item.REPORTERCLONETEMPLATE, "Reporter clone templates", "Gives access to reporter clone templates", power_users_create);
   
       // Array LIMS - plates

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

@@ -26 +26 @@
 import java.util.List;
 
+import net.sf.basedb.core.data.ReporterCloneTemplateData;
 import net.sf.basedb.core.hibernate.TypeWrapper;
 import net.sf.basedb.core.query.Dynamic;
@@ -58 +59 @@
   
   /**
-    The number of bytes this batcher has added to the experiment.
-  */
-  private long bytes = 0;
-
-  /**
     The statement that inserts cloned reporter data.
 <pre class="code">
@@ -81 +77 @@
   {
     super();
-    this.experiment = experiment;
+    this.experiment = Experiment.getById(dc, experiment.getId());
     this.virtualDb = experiment.getVirtualDb();
     this.bytesPerRow = VirtualTable.CLONED_REPORTERS.getBytesPerRow(virtualDb);
@@ -118 +114 @@
     throws BaseException
   {
-    virtualDb.getReporterCloneTemplate().addBytes(bytes);
-    experiment.addBytes(bytes);
-    
     try
     {
@@ -134 +127 @@
       LogUtil.logSQLExceptionChain(logSql, ex);
     }
-    if (!getDbControl().isRolledBack())
+    if (!getDbControl().isRolledBack() && virtualDb.hasClonedReporters())
     {
       String catalog = Application.getDynamicCatalog();
@@ -145 +138 @@
 
   /**
-    Clone the current reporter information to the dynamic database.
+    Get the current experiment this batcher is used with.
+  */
+  public Experiment getExperiment()
+  {
+    return experiment;
+  }
+  
+  /**
+    Drop the cloned reporter information from the dynamic database. If the
+    current experiment doesn't have any cloned reporters, nothing is done.
+  */
+  public void dropClonedReporters()
+  {
+    DbControl dc = getDbControl();
+    
+    if (virtualDb.hasClonedReporters())
+    {
+      // Schedule the old table for removal on successful commit
+      String oldTableName = VirtualTable.CLONED_REPORTERS.getTableName(virtualDb);
+      dc.addTransactionalAction(new DropDynamicTableAction(oldTableName, true, false));
+      
+      // Delete the old template
+      ReporterCloneTemplateData oldClone = virtualDb.getData().getReporterCloneTemplate();
+      HibernateUtil.deleteData(dc.getHibernateSession(), oldClone);
+      virtualDb.getData().setReporterCloneTemplate(null);
+      
+      // Return used bytes to the experiment
+      experiment.addBytes(-oldClone.getBytes());
+    }
+  }
+  
+  /**
+    Create a reporter clone table in the dynamic database for this
+    experiment and populate it with the current reporter annotations
+    for all reporters that are part of the experiment. This method will
+    create an immutable copy of the template so that we can always know
+    which fields that have been cloned, even if the template is modified.
+    If there already is a cloned reporter information it will be removed.
+    
     @param progress An optional progress reporter
     @return The number of cloned reporters
   */
-  int cloneReporters(ProgressReporter progress)
-  {
+  public int cloneReporters(ReporterCloneTemplate template, ProgressReporter progress)
+  {
+    DbControl dc = getDbControl();
+    
+    // Drop existing cloned reporters (if any)
+    dropClonedReporters();
+    
+    // Create a copy of the template
+    ReporterCloneTemplateData copy = template.createLockedCopy();
+    virtualDb.getData().setReporterCloneTemplate(copy);
+    HibernateUtil.saveData(dc.getHibernateSession(), copy);
+
+    // Create the clone table...
+    if (progress != null) progress.display(0, "Creating clone table...");
+    String cloneTableName = HibernateUtil.createVirtualTable(virtualDb, VirtualTable.CLONED_REPORTERS);
+    // ...and an action that drops it in the case of a rollback
+    dc.addTransactionalAction(new DropDynamicTableAction(cloneTableName, false, true));
+    
+    long bytes = 0;
     int insertCount = 0;
     int batchSize = getBatchSize();
     try
     {
-      DbControl dc = getDbControl();
       DynamicPositionQuery query = buildSelectQuery();
       long totalCount = query.count(dc);
@@ -199 +246 @@
       }
       
+      virtualDb.getReporterCloneTemplate().addBytes(bytes);
+      experiment.addBytes(bytes);
+      
       flushInternal();
       
@@ -275 +325 @@
     }
     
-    
     return query;
   }

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

@@ -23 +23 @@
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
@@ -37 +38 @@
   A reporter clone template is a definition of which reporter properties/annotations
   that should be cloned to a per-experiment table in the dynamic database. The
-  cloning operation is initiated with {@link Experiment#cloneReporters(DbControl, 
-  ReporterCloneTemplate, ProgressReporter)}. The reporter internal and external id
+  cloning operation is initiated with {@link Experiment#getReporterCloneBatcher(DbControl)}. 
+  The reporter internal and external id
   are always cloned and should not be part of the template. The cloning operation
   also creates a locked copy of the template, so that it is possible to make modifications
@@ -266 +267 @@
   
   /**
+    Check if this template contains a cloned property with
+    the given name.
+    @param propertyName The property name to check
+    @return TRUE if the template contains the given property, FALSE if not
+  */
+  public boolean hasClonedProperty(String propertyName)
+  {
+    return getData().getProperties().containsKey(propertyName);
+  }
+  
+  /**
     Get a list with all cloned properties in this template. The returned list 
     is a copy of the information in this template and modifications to the list
@@ -277 +289 @@
     for (Map.Entry<String, ReporterClonePropertyData> data : properties)
     {
-      list.add(new ClonedProperty(data.getKey(), data.getValue()));
+      ClonedProperty cp = new ClonedProperty(data.getKey(), data.getValue());
+      int insertIndex = Collections.binarySearch(list, cp);
+      if (insertIndex < 0) list.add(-1-insertIndex, cp);
     }
     return list;

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

@@ -140 +140 @@
   }
 
-  
+  private boolean extendedProperty;
+  /**
+    If the column is nullable or not.
+    @hibernate.property column="`extended_property`" type="boolean" not-null="true" update="false"
+  */
+  public boolean isExtendedProperty()
+  {
+    return extendedProperty;
+  }
+  public void setExtendedProperty(boolean extendedProperty)
+  {
+    this.extendedProperty = extendedProperty;
+  }
+
 }

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

@@ -42 +42 @@
 public class ReporterCloneTemplateData
   extends CommonData
-  implements RegisteredData
+  implements RegisteredData, LoggableData
 {
   public ReporterCloneTemplateData()

trunk/src/test/TestReporterCloneTemplate.java

@@ -31 +31 @@
 import net.sf.basedb.core.ItemResultList;
 import net.sf.basedb.core.Permission;
+import net.sf.basedb.core.ReporterCloneBatcher;
 import net.sf.basedb.core.ReporterCloneTemplate;
 import net.sf.basedb.util.ConsoleProgressReporter;
@@ -81 +82 @@
       // Standard test: Delete
       if (TestUtil.waitBeforeDelete()) TestUtil.waitForEnter();
+      test_remove_cloned_reporters(experimentId);
       test_delete(id);
-      
     }
     finally
@@ -244 +245 @@
       Experiment exp = Experiment.getById(dc, experimentId);
       
-      exp.cloneReporters(dc, rct, TestUtil.getSilent() ? null : new ConsoleProgressReporter());
+      ReporterCloneBatcher batcher = exp.getReporterCloneBatcher(dc);
+      batcher.cloneReporters(rct, TestUtil.getSilent() ? null : new ConsoleProgressReporter());
       
       dc.commit();
@@ -260 +262 @@
       if (dc != null) dc.close();
     }
-
+  }
   
-  }
-  
-  
+  static void test_remove_cloned_reporters(int experimentId)
+  {
+    if (experimentId == 0) return;
+    DbControl dc = null;
+    try
+    {
+      dc = TestUtil.getDbControl();
+      Experiment exp = Experiment.getById(dc, experimentId);
+      
+      ReporterCloneBatcher batcher = exp.getReporterCloneBatcher(dc);
+      batcher.dropClonedReporters();
+      
+      dc.commit();
+      write("--Remove cloned reporters OK");
+    }
+    catch (Throwable ex)
+    {
+      write("--Remove cloned reporters FAILED");
+      ex.printStackTrace();
+      ok = false;
+    }
+    finally
+    {
+      if (dc != null) dc.close();
+    }
+  }
+
 }

trunk/www/include/menu.jsp

@@ -954 +954 @@
     final boolean hasClients = sc.hasPermission(Permission.READ, Item.CLIENT);
     final boolean hasNews = sc.hasPermission(Permission.READ, Item.NEWS);
+    final boolean hasReporterCloneTemplates = !sc.hasPermission(Permission.DENIED, Item.REPORTERCLONETEMPLATE);
     final boolean hasDiskUsage = sc.hasPermission(Permission.READ, Item.DISKUSAGE);
     final Client currentClient = Client.getById(dc, sc.getClientId());
@@ -960 +961 @@
     final boolean hasAdministrate = 
       hasUsers || hasGroups || hasRoles || hasQuota || hasTypes || hasPlugins ||
-      hasSoftware || hasHardware || hasProtocols || hasClients || hasNews ||
+      hasSoftware || hasHardware || hasProtocols || hasClients || hasNews || hasReporterCloneTemplates || 
       hasDiskUsage || hasServer || hasTopPlatforms;
 
@@ -1031 +1032 @@
           tooltip="<%=menu.getString("news.tooltip", hasNews)%>" 
           enabled="<%=hasNews%>"
+        />
+        <m:menuitem 
+          title="<%=common.getString("item.reporterclonetemplate+")%>" 
+          onclick="<%="Menu.openUrl('"+root+"admin/reporterclonetemplates/index.jsp?ID="+ID+"')"%>" 
+          tooltip="<%=menu.getString("reporterclonetemplates.tooltip", hasReporterCloneTemplates)%>" 
+          enabled="<%=hasReporterCloneTemplates%>"
         />
         <m:menuseparator />

trunk/www/include/scripts/main.js

@@ -615 +615 @@
     this.controllers['ANNOTATION'] = { url:'common/annotations/index.jsp', width:700, height:480, edit:true, popup:true };
     this.controllers['ITEMSUBTYPE'] = { url:'admin/itemsubtypes/index.jsp', width:640, height:440 };
+    this.controllers['REPORTERCLONETEMPLATE'] = { url:'admin/reporterclonetemplates/index.jsp', width:640, height:440 };
   }
   

trunk/www/views/experiments/list_experiments.jsp

@@ -283 +283 @@
       />
       <tbl:columndef 
+        id="reporterCloneTemplate"
+        property="virtualDb.reporterCloneTemplate.name"
+        datatype="string"
+        title="Reporter clone template"
+        sortable="true" 
+        filterable="true"
+        exportable="true"
+      />
+      <tbl:columndef 
         id="title"
         property="title"
@@ -572 +581 @@
                     enablePropertyLink="<%=mode.hasPropertyLink()%>"
                   /></tbl:cell>
+                <tbl:cell column="reporterCloneTemplate"
+                  ><base:propertyvalue 
+                    item="<%=item%>" 
+                    property="virtualDb.reporterCloneTemplate" 
+                    enableEditLink="<%=mode.hasEditLink()%>" 
+                    enablePropertyLink="<%=mode.hasPropertyLink()%>"
+                  /></tbl:cell>
                 <tbl:cell column="title"><%=HTML.encodeTags(item.getTitle())%></tbl:cell>
                 <tbl:cell column="abstract"><%=HTML.encodeTags(item.getAbstract())%></tbl:cell>

trunk/www/views/experiments/view_experiment.jsp

@@ -394 +394 @@
       </tr>
       <tr>
+        <td class="prompt">Reporter clone template</td>
+        <td><base:propertyvalue item="<%=experiment%>" property="virtualDb.reporterCloneTemplate" nulltext="<i>- no cloned reporters -</i>" /></td>
+      </tr>
+      <tr>
         <td class="prompt">Bytes</td>
         <td><%=Values.formatBytes(experiment.getBytes())%></td>