Changeset 920 for branches/features/purchaseOrders/grails-app/services

Timestamp:

May 7, 2011, 12:42:44 PM (14 years ago)

Author:

gav

Message:

Svn merge -r874:r919 trunk/ into branches/features/purchaseOrders.
This brings the purchaseOrder branch fully up to date.

Location:

branches/features/purchaseOrders

Files:

• . (modified) (1 prop)
• grails-app/services/AssetTreeService.groovy (modified) (7 diffs)

branches/features/purchaseOrders/grails-app/services/AssetTreeService.groovy

@@ -111 +111 @@
 
         def sw = new StringWriter()
-        def mkp = new groovy.xml.MarkupBuilder(sw)
-
-        mkp.div(class: buttonHtmlClass) {
+        def mb = new groovy.xml.MarkupBuilder(sw)
+
+        mb.div(class: buttonHtmlClass) {
             a( href: hrefShowPane() ) {
                 img(src: treeRootImg, alt: 'Asset Tree', title: 'Asset Tree')
             }
-        } // mkp
+        }
 
         return sw.toString()
@@ -133 +133 @@
 
         def sw = new StringWriter()
-        def mkp = new groovy.xml.MarkupBuilder(sw)
-
-        mkp.div(class: paneHtmlClass, id: paneHtmlId, style: 'display:none;') {
+        def mb = new groovy.xml.MarkupBuilder(sw)
+
+        mb.div(class: paneHtmlClass, id: paneHtmlId, style: 'display:none;') {
             div(class: paneCloseHtmlClass) {
                 a( href: js.toggle(paneHtmlId) ) {
@@ -155 +155 @@
                 } // table
             } // div
-        } // mkp
+        }
 
         return sw.toString()
@@ -203 +203 @@
 
         def sw = new StringWriter()
-        def mkp = new groovy.xml.MarkupBuilder(sw)
+        def mb = new groovy.xml.MarkupBuilder(sw)
 
         // Offer a site create link if no sites are found.
         if(!sites) {
-            mkp.div(class: tableDivHtmlClass) {
+            mb.div(class: tableDivHtmlClass) {
 
                 div(class: paneCloseHtmlClass) {
@@ -235 +235 @@
                     }
                 } // button div
-            } // mkp
+            } // mb
             return sw.toString()
         } // if(!sites)
@@ -242 +242 @@
         // The main populated table.
         /// @todo: use a loop for the subItem levels.
-        mkp.div(class: tableDivHtmlClass) {
+        mb.div(class: tableDivHtmlClass) {
 
             div(class: paneCloseHtmlClass) {
@@ -443 +443 @@
             }
 
-        } // mkp
+        } // mb
 
         def totalTime = (System.currentTimeMillis() - startedAt)/1000