Changeset 5467


Ignore:
Timestamp:
Nov 2, 2010, 9:09:32 AM (11 years ago)
Author:
Nicklas Nordborg
Message:

References #1538: Biomaterial description and registered date are not displayed in the wells list

Also needed to fix the temporary filter used when selecting biowells for a sample/extract/labeled extract.

Location:
branches/2.16-stable/www/biomaterials
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/2.16-stable/www/biomaterials/bioplates/wells/list_biowells.jsp

    r5466 r5467  
    112112  try
    113113  {
    114     final ItemQuery<BioWell> query = Base.getConfiguredQuery(dc, cc, false, bioplate.getBioWells(), mode);
     114    final ItemQuery<BioWell> query = Base.getConfiguredQuery(dc, cc, true, bioplate.getBioWells(), mode);
    115115    query.join(Hql.leftJoin(null, "bioMaterial", "mbm", null, true));
    116116    query.join(Hql.leftJoin("mbm", "creationEvent", "evt", null, true));
  • branches/2.16-stable/www/biomaterials/extracts/edit_extract.jsp

    r5459 r5467  
    398398      }
    399399      url += '&bioplate_id='+bioplateId;
    400       url += '&resetTemporary=1&tmpfilter:STRING:bioMaterial.name='+escape('=');
     400      url += '&resetTemporary=1&tmpfilter:STRING:$mbm.name='+escape('=');
    401401      url += '&tmpfilter:STRING:originalBioMaterial.name='+escape('=');
    402402      url += '&columns=row,column';
  • branches/2.16-stable/www/biomaterials/labeledextracts/edit_labeledextract.jsp

    r5459 r5467  
    429429      }
    430430      url += '&bioplate_id='+bioplateId;
    431       url += '&resetTemporary=1&tmpfilter:STRING:bioMaterial.name='+escape('=');
     431      url += '&resetTemporary=1&tmpfilter:STRING:$mbm.name='+escape('=');
    432432      url += '&tmpfilter:STRING:originalBioMaterial.name='+escape('=');
    433433      url += '&columns=row,column';
  • branches/2.16-stable/www/biomaterials/samples/edit_sample.jsp

    r5459 r5467  
    400400      }
    401401      url += '&bioplate_id='+bioplateId;
    402       url += '&resetTemporary=1&tmpfilter:STRING:bioMaterial.name='+escape('=');
     402      url += '&resetTemporary=1&tmpfilter:STRING:$mbm.name='+escape('=');
    403403      url += '&tmpfilter:STRING:originalBioMaterial.name='+escape('=');
    404404      url += '&columns=row,column';
Note: See TracChangeset for help on using the changeset viewer.