Changeset 7578 for branches/3.14-stable


Ignore:
Timestamp:
Jan 14, 2019, 8:15:44 AM (3 years ago)
Author:
Nicklas Nordborg
Message:

Fixes #2145: Use raw data type as subtype when matching annotation categories

Location:
branches/3.14-stable/www/common/annotations
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/3.14-stable/www/common/annotations/annotate.jsp

    r7334 r7578  
    3939  import="net.sf.basedb.core.BioPlateType"
    4040  import="net.sf.basedb.core.BioPlate"
     41  import="net.sf.basedb.core.RawBioAssay"
     42  import="net.sf.basedb.core.RawDataType"
    4143  import="net.sf.basedb.core.AnnotationSet"
    4244  import="net.sf.basedb.core.Annotation"
     
    156158      subtype = bpt.getItemSubtype();
    157159      if (subtype == null) selectedCategoryName = bpt.getName();
     160    }
     161    else if (item instanceof RawBioAssay)
     162    {
     163      RawDataType rdt = ((RawBioAssay)item).getRawDataType();
     164      selectedCategoryName = rdt.getName();
    158165    }
    159166    if (subtype != null) selectedCategoryName = subtype.getName();
  • branches/3.14-stable/www/common/annotations/list_annotations.jsp

    r7334 r7578  
    2323  @version 2.0
    2424--%>
    25 <%@page import="java.util.Collections"%>
    26 <%@page import="net.sf.basedb.util.units.UnitConverter"%>
    2725<%@ page pageEncoding="UTF-8" session="false"
    2826  import="net.sf.basedb.core.SessionControl"
     
    4240  import="net.sf.basedb.core.BioPlate"
    4341  import="net.sf.basedb.core.BioPlateType"
     42  import="net.sf.basedb.core.RawDataType"
     43  import="net.sf.basedb.core.RawBioAssay"
    4444  import="net.sf.basedb.core.ItemQuery"
    4545  import="net.sf.basedb.core.ItemResultList"
     
    5656  import="net.sf.basedb.clients.web.util.HTML"
    5757  import="net.sf.basedb.util.NameableComparator"
     58  import="net.sf.basedb.util.units.UnitConverter"
    5859  import="net.sf.basedb.util.formatter.Formatter"
    5960  import="net.sf.basedb.util.formatter.PrefixSuffixFormatter"
    6061  import="net.sf.basedb.clients.web.formatter.FormatterFactory"
    6162  import="net.sf.basedb.util.Values"
     63  import="java.util.Collections"
    6264  import="java.util.ArrayList"
    6365  import="java.util.List"
     
    165167      subtype = bpt.getItemSubtype();
    166168      if (subtype == null) selectedCategoryName = bpt.getName();
     169    }
     170    else if (item instanceof RawBioAssay)
     171    {
     172      RawDataType rdt = ((RawBioAssay)item).getRawDataType();
     173      selectedCategoryName = rdt.getName();
    167174    }
    168175    if (subtype != null) selectedCategoryName = subtype.getName();
Note: See TracChangeset for help on using the changeset viewer.