Changeset 799

Timestamp:

Feb 9, 2011, 6:11:00 PM (14 years ago)

Author:

gav

Message:

Change Task.toString() and display primaryAsset.name in front of description.

Location:

trunk/grails-app

Files:

• domain/Task.groovy (modified) (1 diff)
• views/taskDetailed/search.gsp (modified) (2 diffs)
• views/taskDetailed/show.gsp (modified) (1 diff)

trunk/grails-app/domain/Task.groovy

@@ -61 +61 @@
     }
 
-    String toString() {"${this.id} - ${this.description}"}
+    String toString() {
+        def s = "#${this.id} - "
+        if(this.primaryAsset)
+            s += "${primaryAsset.name}: "
+        s += "${this.description}"
+    }
+
 }

trunk/grails-app/views/taskDetailed/search.gsp

@@ -145 +145 @@
 
                                     <b>
+                                    <g:if test="${taskInstance.primaryAsset}">
+                                        ${fieldValue(bean:taskInstance, field:'primaryAsset')}:
+                                    </g:if>
                                     ${fieldValue(bean:taskInstance, field:'description')}
                                     </b>
@@ -164 +167 @@
                                     <br />
                                     <br />
-                                    <g:if test="${taskInstance.primaryAsset}">
-                                        ${fieldValue(bean:taskInstance, field:'primaryAsset')}<br />
-                                    </g:if>
                                     <g:each in="${taskInstance.assignedGroups}" status="j" var="assignedGroup">
                                         ${assignedGroup.encodeAsHTML()}<br />

trunk/grails-app/views/taskDetailed/show.gsp

@@ -44 +44 @@
                     </g:if>
                 </h1>
+                <g:if test="${taskInstance.primaryAsset}" >
+                    ${fieldValue(bean:taskInstance, field:'primaryAsset')}:
+                </g:if>
                 ${fieldValue(bean:taskInstance, field:'description')}
                 <g:if test="${taskInstance.safetyRequirement}" >