Changeset 796

Timestamp:

Aug 10, 2010, 5:06:00 PM (11 years ago)

Author:

keesvb

Message:

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

Location:

trunk

Files:

• grails-app/domain/dbnp/studycapturing/Study.groovy (modified) (3 diffs)
• grails-app/domain/dbnp/studycapturing/Template.groovy (modified) (2 diffs)
• grails-app/domain/dbnp/user (added)
• grails-app/domain/dbnp/user/Profile.groovy (moved) (moved from trunk/grails-app/domain/nimble/Profile.groovy) (1 diff)
• grails-app/domain/dbnp/user/User.groovy (moved) (moved from trunk/grails-app/domain/nimble/User.groovy) (1 diff)
• grails-app/i18n/messages-nimble.properties (deleted)
• grails-app/i18n/messages-nimble_de.properties (deleted)
• grails-app/i18n/messages-nimble_pt.properties (deleted)
• grails-app/i18n/shiro.properties (deleted)
• grails-app/views/layouts/nimble.gsp (deleted)
• grails-app/views/study/create.gsp (modified) (1 diff)
• grails-app/views/study/edit.gsp (modified) (3 diffs)
• test/unit/dbnp/user (added)
• test/unit/nimble (deleted)

trunk/grails-app/domain/dbnp/studycapturing/Study.groovy

@@ -1 +1 @@
 package dbnp.studycapturing
+
+import dbnp.user.User
 
 /**
@@ -14 +16 @@
     }
 
-        nimble.User owner   // The owner of the study. A new study is automatically owned by its creator.
+        User owner   // The owner of the study. A new study is automatically owned by its creator.
         String title        // The title of the study
         String code             // currently used as the external study ID, e.g. to reference a study in a SAM module
@@ -28 +30 @@
 
         static hasMany = [
-                editors: nimble.User,   // Users with read/write access to the study
-                readers: nimble.User,   // Users with only read access to the study
+                editors: User,   // Users with read/write access to the study
+                readers: User,   // Users with only read access to the study
                 subjects: Subject,
                 samplingEvents: SamplingEvent,

trunk/grails-app/domain/dbnp/studycapturing/Template.groovy

@@ -1 +1 @@
 package dbnp.studycapturing
+
+import dbnp.user.User
 
 /**
@@ -29 +31 @@
 
         /** The owner of the template. If the owner is not defined, it is a shared/public template */
-        nimble.User owner
+        User owner
 
         /** 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

@@ -13 +13 @@
  * $Date$
  */
-package nimble
+package dbnp.user
 
 class Profile {

trunk/grails-app/domain/dbnp/user/User.groovy

@@ -13 +13 @@
  * $Date$
  */
-package nimble
+package dbnp.user
 
 class User {

trunk/grails-app/views/study/create.gsp

@@ -105 +105 @@
                                 </td>
                                 <td valign="top" class="value ${hasErrors(bean: studyInstance, field: 'owner', 'errors')}">
-                                    <g:select name="owner.id" from="${nimble.User.list()}" optionKey="id" value="${studyInstance?.owner?.id}"  />
+                                    <g:select name="owner.id" from="${dbnp.user.User.list()}" optionKey="id" value="${studyInstance?.owner?.id}"  />
                                 </td>
                             </tr>

trunk/grails-app/views/study/edit.gsp

@@ -90 +90 @@
                                 </td>
                                 <td valign="top" class="value ${hasErrors(bean: studyInstance, field: 'readers', 'errors')}">
-                                    <g:select name="readers" from="${nimble.User.list()}" multiple="yes" optionKey="id" size="5" value="${studyInstance?.readers}" />
+                                    <g:select name="readers" from="${dbnp.user.User.list()}" multiple="yes" optionKey="id" size="5" value="${studyInstance?.readers}" />
                                 </td>
                             </tr>
@@ -108 +108 @@
                                 </td>
                                 <td valign="top" class="value ${hasErrors(bean: studyInstance, field: 'editors', 'errors')}">
-                                    <g:select name="editors" from="${nimble.User.list()}" multiple="yes" optionKey="id" size="5" value="${studyInstance?.editors}" />
+                                    <g:select name="editors" from="${dbnp.user.User.list()}" multiple="yes" optionKey="id" size="5" value="${studyInstance?.editors}" />
                                 </td>
                             </tr>
@@ -153 +153 @@
                                 </td>
                                 <td valign="top" class="value ${hasErrors(bean: studyInstance, field: 'owner', 'errors')}">
-                                    <g:select name="owner.id" from="${nimble.User.list()}" optionKey="id" value="${studyInstance?.owner?.id}"  />
+                                    <g:select name="owner.id" from="${dbnp.user.User.list()}" optionKey="id" value="${studyInstance?.owner?.id}"  />
                                 </td>
                             </tr>