Ignore:
Timestamp:
Aug 7, 2015, 8:34:06 AM (7 years ago)
Author:
Nicklas Nordborg
Message:

References #1941: Store experimental factor values as part experiments

Removing the annotation on a parent item will nullify the link from cloned annotations instead of removing the clones.

Other changes are related to fixing various NullPointerExceptions and other problems resulting from having "inherited" annotations without a parent item.

But more work is needed on this since the cloned annotations now end up in a state that is almost impossible to manage via the gui. The "batch inherit annotations" can be used to remove or update cloned annotation.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/www/common/annotations/list_annotations.jsp

    r6922 r6937  
    119119    {
    120120      AnnotationType at = a.getAnnotationType(dc);
    121       if (!a.isInherited())
     121      if (a.getSource() == Annotation.Source.PRIMARY)
    122122      {
    123123        existing.put(a.getAnnotationType(dc), a);
     
    470470          />
    471471          <tbl:columndef
     472            id="values"
     473            title="Values"
     474          />
     475          <tbl:columndef
    472476            id="source"
    473477            title="Cloned"
     
    476480            id="item"
    477481            title="From item"
    478           />
    479           <tbl:columndef
    480             id="values"
    481             title="Values"
    482482          />
    483483          <tbl:columndef
Note: See TracChangeset for help on using the changeset viewer.