Changeset 1386 for trunk/grails-app/views/templateEditor/elements

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/views/templateEditor/elements

Files:

• _boolean.gsp (deleted)
• _date.gsp (deleted)
• _double.gsp (deleted)
• _fieldForm.gsp (modified) (1 diff)
• _file.gsp (deleted)
• _liFieldDomain.gsp (modified) (1 diff)
• _liFieldInUse.gsp (modified) (1 diff)
• _liFieldNotInUse.gsp (modified) (1 diff)
• _liFieldSelected.gsp (modified) (1 diff)
• _long.gsp (deleted)
• _module.gsp (deleted)
• _ontologyterm.gsp (deleted)
• _reltime.gsp (deleted)
• _string.gsp (deleted)
• _stringlist.gsp (deleted)
• _template.gsp (deleted)
• _text.gsp (deleted)

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

@@ -22 +22 @@
                           <option
                                 <g:if test="${templateField?.type == field}">selected="selected"</g:if>
-                                value="${field}">${field} <g:if test="${field.example}">(${field.example})</g:if></option>
+                                value="${field}">${field.name} <g:if test="${field.example}">(${field.example})</g:if></option>
                         </g:each>
                   </optgroup>

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

@@ -1 +1 @@
   <b>${templateField.name}</b>
-  (<g:if test="${templateField.unit}">${templateField.unit}, </g:if><g:render template="elements/${templateField.type.toString().toLowerCase().replaceAll(/ /,'_')}" model="[templateField: templateField]"/>)
+  (<g:if test="${templateField.unit}">${templateField.unit}, </g:if>${templateField.type.name})
     
 

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

@@ -7 +7 @@
 
     <b>${templateField.name}</b>
-    (<g:if test="${templateField.unit}">${templateField.unit}, </g:if><g:render template="elements/${templateField.type.toString().toLowerCase().replaceAll(/ /,'_')}" model="[templateField: templateField]"/>)
+    (<g:if test="${templateField.unit}">${templateField.unit}, </g:if>${templateField.type.name})
     
 <form class="templateField_form" id="templateField_${templateField.id}_form" action="updateField">

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

@@ -6 +6 @@
 
 <b>${templateField.name}</b>
-(<g:if test="${templateField.unit}">${templateField.unit}, </g:if><g:render template="elements/${templateField.type.toString().toLowerCase().replaceAll(/ /,'_')}" model="[templateField: templateField]" />)
+(<g:if test="${templateField.unit}">${templateField.unit}, </g:if>${templateField.type.name})
 
 <form class="templateField_form" id="templateField_${templateField.id}_form" action="updateField">

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

@@ -11 +11 @@
   <span class="ui-icon ui-icon-arrowthick-2-n-s"></span>
   <b>${templateField.name}</b>
-  (<g:if test="${templateField.unit}">${templateField.unit}, </g:if><g:render template="elements/${templateField.type.toString().toLowerCase().replaceAll(/ /,'_')}" model="[templateField: templateField]"/>)
+  (<g:if test="${templateField.unit}">${templateField.unit}, </g:if>${templateField.type.name})
 
   <form class="templateField_form" id="templateField_${templateField.id}_form" action="updateField">