Changeset 1386


Ignore:
Timestamp:
Jan 13, 2011, 12:32:04 AM (12 years ago)
Author:
business@…
Message:

change which hopefully fixes the first time run errors about AssayModule?.url, and further implementation of #268 (with a nice refactoring)

Location:
trunk/grails-app
Files:
12 deleted
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/grails-app/conf/BootStrapStudies.groovy

    r1328 r1386  
    391391                        name: 'SAM module for clinical data',
    392392                        platform: 'clinical measurements',
    393                         url: config.modules.sam.url
     393                        url: config.modules.sam.url.toString()
    394394                ).with { if (!validate()) { errors.each { println it} } else save()}
    395395
    … …  
    398398                        name: 'Metabolomics module',
    399399                        platform: 'GCMS/LCMS',
    400                         url: config.modules.metabolomics.url
     400                        url: config.modules.metabolomics.url.toString()
    401401                ).with { if (!validate()) { errors.each { println it} } else save()}
    402402               
    … …  
    405405                        name: 'Metagenomics module',
    406406                        platform: 'High throughput sequencing',
    407                         url: config.modules.metagenomics.url
     407                        url: config.modules.metagenomics.url.toString()
    408408                ).with { if (!validate()) { errors.each { println it} } else save()}
    409409               

  • trunk/grails-app/views/templateEditor/elements/_fieldForm.gsp

    r1175 r1386  
    2222                          <option
    2323                                <g:if test="${templateField?.type == field}">selected="selected"</g:if>
    24                                 value="${field}">${field} <g:if test="${field.example}">(${field.example})</g:if></option>
     24                                value="${field}">${field.name} <g:if test="${field.example}">(${field.example})</g:if></option>
    2525                        </g:each>
    2626                  </optgroup>

  • trunk/grails-app/views/templateEditor/elements/_liFieldDomain.gsp

    r959 r1386  
    11  <b>${templateField.name}</b>
    2   (<g:if test="${templateField.unit}">${templateField.unit}, </g:if><g:render template="elements/${templateField.type.toString().toLowerCase().replaceAll(/ /,'_')}" model="[templateField: templateField]"/>)
     2  (<g:if test="${templateField.unit}">${templateField.unit}, </g:if>${templateField.type.name})
    33   
    44

  • trunk/grails-app/views/templateEditor/elements/_liFieldInUse.gsp

    r1175 r1386  
    77
    88    <b>${templateField.name}</b>
    9     (<g:if test="${templateField.unit}">${templateField.unit}, </g:if><g:render template="elements/${templateField.type.toString().toLowerCase().replaceAll(/ /,'_')}" model="[templateField: templateField]"/>)
     9    (<g:if test="${templateField.unit}">${templateField.unit}, </g:if>${templateField.type.name})
    1010   
    1111<form class="templateField_form" id="templateField_${templateField.id}_form" action="updateField">

  • trunk/grails-app/views/templateEditor/elements/_liFieldNotInUse.gsp

    r1175 r1386  
    66
    77<b>${templateField.name}</b>
    8 (<g:if test="${templateField.unit}">${templateField.unit}, </g:if><g:render template="elements/${templateField.type.toString().toLowerCase().replaceAll(/ /,'_')}" model="[templateField: templateField]" />)
     8(<g:if test="${templateField.unit}">${templateField.unit}, </g:if>${templateField.type.name})
    99
    1010<form class="templateField_form" id="templateField_${templateField.id}_form" action="updateField">

  • trunk/grails-app/views/templateEditor/elements/_liFieldSelected.gsp

    r1175 r1386  
    1111  <span class="ui-icon ui-icon-arrowthick-2-n-s"></span>
    1212  <b>${templateField.name}</b>
    13   (<g:if test="${templateField.unit}">${templateField.unit}, </g:if><g:render template="elements/${templateField.type.toString().toLowerCase().replaceAll(/ /,'_')}" model="[templateField: templateField]"/>)
     13  (<g:if test="${templateField.unit}">${templateField.unit}, </g:if>${templateField.type.name})
    1414
    1515  <form class="templateField_form" id="templateField_${templateField.id}_form" action="updateField">
Note: See TracChangeset for help on using the changeset viewer.