Changeset 6949


Ignore:
Timestamp:
Sep 10, 2015, 2:34:16 PM (6 years ago)
Author:
Nicklas Nordborg
Message:

References #1951: Can't create reporter list from Array design features

Port this fix to the BASE 3.5 stable branch so that it can be inlcuded in the next bugfix release.

Location:
branches/3.5-stable/www
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/3.5-stable/www/lims/arraydesigns/features/index.jsp

    r6192 r6949  
    3636  import="net.sf.basedb.core.data.FeatureData"
    3737  import="net.sf.basedb.core.data.ReporterData"
     38  import="net.sf.basedb.core.query.Hql"
    3839  import="net.sf.basedb.clients.web.Base"
    3940  import="net.sf.basedb.clients.web.WebException"
     
    111112    final ArrayDesign arrayDesign = ArrayDesign.getById(dc, arrayDesignId);
    112113    final DataQuery<FeatureData> query = arrayDesign.getFeatures();
     114    query.join(Hql.leftJoin(null, "reporter", "rpt", null, true));
    113115    cc.configureQuery(dc, query, true);
    114116    cc.setQuery(query);
     
    126128    final ArrayDesign arrayDesign = ArrayDesign.getById(dc, arrayDesignId);
    127129    final DataQuery<ReporterData> query = arrayDesign.getReporters();
     130    query.join(Hql.leftJoin("reporter", "rpt"));
    128131    cc.configureQuery(dc, query, true);
    129132    dc.close();
  • branches/3.5-stable/www/views/rawbioassays/rawdata/index.jsp

    r6192 r6949  
    152152    ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, rawDataType.getId(), pageContext, defaultContext);
    153153    final DataQuery<ReporterData> query = rba.getReporters();
     154    query.join(Hql.leftJoin("reporter", "r"));
     155    query.join(Hql.leftJoin("feature", "f"));
    154156    cc.configureQuery(dc, query, true);
    155157    cc.setQuery(query);
  • branches/3.5-stable/www/views/rawbioassays/rawdata/list_rawdata.jsp

    r6834 r6949  
    446446        id="feature.metaGridX"
    447447        property="$f.arrayDesignBlock.metaGridX"
    448         exportproperty="feature.arrayDesignBlock.metaGridx"
     448        exportproperty="feature.arrayDesignBlock.metaGridX"
    449449        datatype="int"
    450450        title="[Feat] Meta grid X"
Note: See TracChangeset for help on using the changeset viewer.