Changeset 5666


Ignore:
Timestamp:
Jun 23, 2011, 12:54:53 PM (12 years ago)
Author:
Nicklas Nordborg
Message:

References #1597: Subtypes of items

Fixes an issue with the table exporter plug-in and item subtypes. The exporter now supports setting a data type specifically for the exportproperty attribute of a <columndef> tag, when the property to export is different than what is used for filtering.

Eg. 

<tbl:columndef
  ...
  property="itemSubtype"
  exportproperty="itemSubtype.name:string"
/>

In this case, filtering is done on the id (INT) column but the name is exported.

Location:
trunk/www
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/www/admin/hardware/list_hardware.jsp

    r5643 r5666  
    254254        property="itemSubtype"
    255255        sortproperty="itemSubtype.name"
    256         exportproperty="itemSubtype.name"
     256        exportproperty="itemSubtype.name:string"
    257257        datatype="int"
    258258        enumeration="<%=Enumeration.fromItems(subtypesQuery.list(dc), "-none-")%>"

  • trunk/www/admin/protocols/list_protocol.jsp

    r5643 r5666  
    261261        property="itemSubtype"
    262262        sortproperty="itemSubtype.name"
    263         exportproperty="itemSubtype.name"
     263        exportproperty="itemSubtype.name:string"
    264264        datatype="int"
    265265        enumeration="<%=Enumeration.fromItems(subtypesQuery.list(dc), "-none-")%>"

  • trunk/www/admin/software/list_software.jsp

    r5643 r5666  
    254254        property="itemSubtype"
    255255        sortproperty="itemSubtype.name"
    256         exportproperty="itemSubtype.name"
     256        exportproperty="itemSubtype.name:string"
    257257        datatype="int"
    258258        enumeration="<%=Enumeration.fromItems(subtypesQuery.list(dc), "-none-")%>"

  • trunk/www/biomaterials/biosources/list_biosources.jsp

    r5643 r5666  
    251251        property="itemSubtype"
    252252        sortproperty="itemSubtype.name"
    253         exportproperty="itemSubtype.name"
     253        exportproperty="itemSubtype.name:string"
    254254        datatype="int"
    255255        enumeration="<%=Enumeration.fromItems(subtypesQuery.list(dc), "-none-")%>"

  • trunk/www/biomaterials/extracts/list_extracts.jsp

    r5664 r5666  
    305305        property="itemSubtype"
    306306        sortproperty="itemSubtype.name"
    307         exportproperty="itemSubtype.name"
     307        exportproperty="itemSubtype.name:string"
    308308        datatype="int"
    309309        enumeration="<%=Enumeration.fromItems(subtypesQuery.list(dc), "-none-")%>"

  • trunk/www/biomaterials/samples/list_samples.jsp

    r5664 r5666  
    303303        property="itemSubtype"
    304304        sortproperty="itemSubtype.name"
    305         exportproperty="itemSubtype.name"
     305        exportproperty="itemSubtype.name:string"
    306306        datatype="int"
    307307        enumeration="<%=Enumeration.fromItems(subtypesQuery.list(dc), "-none-")%>"

  • trunk/www/biomaterials/tags/list_tags.jsp

    r5632 r5666  
    266266        property="itemSubtype"
    267267        sortproperty="itemSubtype.name"
    268         exportproperty="itemSubtype.name"
     268        exportproperty="itemSubtype.name:string"
    269269        datatype="int"
    270270        enumeration="<%=tagTypes%>"

  • trunk/www/filemanager/files/list_files.jsp

    r5643 r5666  
    586586        property="itemSubtype"
    587587        sortproperty="itemSubtype.name"
    588         exportproperty="itemSubtype.name"
     588        exportproperty="itemSubtype.name:string"
    589589        datatype="int"
    590590        enumeration="<%=Enumeration.fromItems(subtypesQuery.list(dc), "-none-")%>"

  • trunk/www/plugins/net/sf/basedb/clients/web/plugins/simple_export.jsp

    r5433 r5666  
    221221      for (var i = 0; i < exportedProperties.length; i++)
    222222      {
    223         var value = exportedProperties[i] + ':' + exportedTypes[i] + ':' + exportedTitles[i];
     223        var value = exportedProperties[i];
     224        if (value.indexOf(':') == -1)
     225        {
     226          value += ':' + exportedTypes[i];
     227        }
     228        value += ':' + exportedTitles[i];
    224229        Forms.createHidden(frm, 'parameter:whichProperties', value);
    225230      }

  • trunk/www/views/derivedbioassaysets/list_bioassaysets.jsp

    r5657 r5666  
    257257        property="itemSubtype"
    258258        sortproperty="itemSubtype.name"
    259         exportproperty="itemSubtype.name"
     259        exportproperty="itemSubtype.name:string"
    260260        datatype="int"
    261261        enumeration="<%=Enumeration.fromItems(subtypesQuery.list(dc), "-none-")%>"

  • trunk/www/views/physicalbioassays/list_bioassays.jsp

    r5662 r5666  
    263263        property="itemSubtype"
    264264        sortproperty="itemSubtype.name"
    265         exportproperty="itemSubtype.name"
     265        exportproperty="itemSubtype.name:string"
    266266        datatype="int"
    267267        enumeration="<%=Enumeration.fromItems(subtypesQuery.list(dc), "-none-")%>"
Note: See TracChangeset for help on using the changeset viewer.