Changeset 6736


Ignore:
Timestamp:
Feb 13, 2015, 1:07:29 PM (7 years ago)
Author:
Nicklas Nordborg
Message:

References #1910: Disable annotation inheritance for annotation types

Do not include inherited annotation columns in the table exporter if the annotation type has disabled inheritance.

Location:
trunk/src/clients/web/net/sf/basedb/clients/web/plugins
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/clients/web/net/sf/basedb/clients/web/plugins/ExportedProperty.java

    r6687 r6736  
    7878      int annotationTypeId = Values.getInt(loadInherited ? name.substring(2) : name.substring(1));
    7979      at = AnnotationType.getById(dc, annotationTypeId);
     80      if (at.getDisableInheritance() && loadInherited) return null;
    8081      name = "annotationtype_"+annotationTypeId;
    8182      if (sameUnits && at.supportUnits())
  • trunk/src/clients/web/net/sf/basedb/clients/web/plugins/SimpleExport.java

    r6687 r6736  
    302302      ExportedProperty ep = ExportedProperty.parse(dc, metadata, column, columnPrefix,
    303303        annotatable, formatter, sameUnits, dataloader);
    304       exportedProperties.add(ep);
    305       properties.add(ep.name);
     304      if (ep != null)
     305      {
     306        exportedProperties.add(ep);
     307        properties.add(ep.name);
     308      }
    306309    }
    307310   
Note: See TracChangeset for help on using the changeset viewer.