Changeset 796

Show
Ignore:
Timestamp:
10-08-10 17:06:00 (4 years ago)
Author:
keesvb
Message:

deleted more nimble stuff, moved User and Profile classes to package dbnp.user

Location:
trunk
Files:
2 added
6 removed
4 modified
2 moved

Legend:

Unmodified
Added
Removed
  • trunk/grails-app/domain/dbnp/studycapturing/Study.groovy

    r787 r796  
    11package dbnp.studycapturing 
     2 
     3import dbnp.user.User 
    24 
    35/** 
     
    1416    } 
    1517 
    16         nimble.User owner   // The owner of the study. A new study is automatically owned by its creator. 
     18        User owner   // The owner of the study. A new study is automatically owned by its creator. 
    1719        String title        // The title of the study 
    1820        String code             // currently used as the external study ID, e.g. to reference a study in a SAM module 
     
    2830 
    2931        static hasMany = [ 
    30                 editors: nimble.User,   // Users with read/write access to the study 
    31                 readers: nimble.User,   // Users with only read access to the study 
     32                editors: User,   // Users with read/write access to the study 
     33                readers: User,   // Users with only read access to the study 
    3234                subjects: Subject, 
    3335                samplingEvents: SamplingEvent, 
  • trunk/grails-app/domain/dbnp/studycapturing/Template.groovy

    r784 r796  
    11package dbnp.studycapturing 
     2 
     3import dbnp.user.User 
    24 
    35/** 
     
    2931 
    3032        /** The owner of the template. If the owner is not defined, it is a shared/public template */ 
    31         nimble.User owner 
     33        User owner 
    3234 
    3335        /** The template fields which are the members of this template. This is a List to preserve the field order */ 
  • trunk/grails-app/domain/dbnp/user/Profile.groovy

    r790 r796  
    1313 * $Date$ 
    1414 */ 
    15 package nimble 
     15package dbnp.user 
    1616 
    1717class Profile { 
  • trunk/grails-app/domain/dbnp/user/User.groovy

    r790 r796  
    1313 * $Date$ 
    1414 */ 
    15 package nimble 
     15package dbnp.user 
    1616 
    1717class User { 
  • trunk/grails-app/views/study/create.gsp

    r359 r796  
    105105                                </td> 
    106106                                <td valign="top" class="value ${hasErrors(bean: studyInstance, field: 'owner', 'errors')}"> 
    107                                     <g:select name="owner.id" from="${nimble.User.list()}" optionKey="id" value="${studyInstance?.owner?.id}"  /> 
     107                                    <g:select name="owner.id" from="${dbnp.user.User.list()}" optionKey="id" value="${studyInstance?.owner?.id}"  /> 
    108108                                </td> 
    109109                            </tr> 
  • trunk/grails-app/views/study/edit.gsp

    r359 r796  
    9090                                </td> 
    9191                                <td valign="top" class="value ${hasErrors(bean: studyInstance, field: 'readers', 'errors')}"> 
    92                                     <g:select name="readers" from="${nimble.User.list()}" multiple="yes" optionKey="id" size="5" value="${studyInstance?.readers}" /> 
     92                                    <g:select name="readers" from="${dbnp.user.User.list()}" multiple="yes" optionKey="id" size="5" value="${studyInstance?.readers}" /> 
    9393                                </td> 
    9494                            </tr> 
     
    108108                                </td> 
    109109                                <td valign="top" class="value ${hasErrors(bean: studyInstance, field: 'editors', 'errors')}"> 
    110                                     <g:select name="editors" from="${nimble.User.list()}" multiple="yes" optionKey="id" size="5" value="${studyInstance?.editors}" /> 
     110                                    <g:select name="editors" from="${dbnp.user.User.list()}" multiple="yes" optionKey="id" size="5" value="${studyInstance?.editors}" /> 
    111111                                </td> 
    112112                            </tr> 
     
    153153                                </td> 
    154154                                <td valign="top" class="value ${hasErrors(bean: studyInstance, field: 'owner', 'errors')}"> 
    155                                     <g:select name="owner.id" from="${nimble.User.list()}" optionKey="id" value="${studyInstance?.owner?.id}"  /> 
     155                                    <g:select name="owner.id" from="${dbnp.user.User.list()}" optionKey="id" value="${studyInstance?.owner?.id}"  /> 
    156156                                </td> 
    157157                            </tr>