Changeset 317 for trunk

Timestamp:

Feb 5, 2010, 9:44:46 AM (15 years ago)

Author:

gav

Message:

Add object descriptions to asset tree.

File:

• trunk/grails-app/services/AssetTreeService.groovy (modified) (9 diffs)

trunk/grails-app/services/AssetTreeService.groovy

@@ -10 +10 @@
 
     def buttonHtmlClass() {
-        "tree_button"
+        'tree_button'
     }
     def paneHtmlClass() {
@@ -29 +29 @@
     def tableLoadingImgId() {
         'assetTreeLoadingImg'
+    }
+
+    /** Name and Description Formatting */
+
+    def name(obj) {
+        obj.name.encodeAsHTML()
+    }
+
+    def description(obj) {
+        def s =  obj.description.encodeAsHTML()
+        if(s) s = ' -- ' + s
+        else ''
     }
 
@@ -127 +139 @@
                                         img(src: dashImg())
                                     a( href: siteShowLink(site.id), onclick: onclickHideAndSavePane() ) {
-                                        yieldUnescaped( site.encodeAsHTML() )
+                                        yieldUnescaped( name(site)  )
                                     }
+                                    yieldUnescaped( description(site)  )
                                     a(href: sectionCreateLink(site.id), onclick: onclickHideAndSavePane()) {
                                         img(src: addImg(), alt: 'Add', title: 'Add Section')
@@ -146 +159 @@
                                                         img(src: dashImg())
                                                     a( href: sectionShowLink(section.id), onclick: onclickHideAndSavePane() ) {
-                                                        yieldUnescaped( section.encodeAsHTML() )
+                                                        yieldUnescaped( name(section) )
                                                     }
+                                                    yieldUnescaped( description(section)  )
                                                     a(href: assetCreateLink(section.id), onclick: onclickHideAndSavePane()) {
                                                         img(src: addImg(), alt: 'Add', title: 'Add Asset')
@@ -166 +180 @@
                                                                         img(src: dashImg())
                                                                     a( href: assetShowLink(asset.id), onclick: onclickHideAndSavePane() ) {
-                                                                        yieldUnescaped( asset.encodeAsHTML() )
+                                                                        yieldUnescaped( name(asset) )
                                                                     }
+                                                                    yieldUnescaped( description(asset) )
                                                                     a(href: assetSubItemCreateLink(asset.id), onclick: onclickHideAndSavePane()) {
                                                                         img(src: addImg(), alt: 'Add', title: 'Add Sub Item')
@@ -189 +204 @@
                                                                                         img(src: dashImg())
                                                                                     a( href: assetSubItemShowLink(assetSubItemL1.id), onclick: onclickHideAndSavePane() ) {
-                                                                                        yieldUnescaped( assetSubItemL1.encodeAsHTML() )
+                                                                                        yieldUnescaped( name(assetSubItemL1) )
                                                                                     }
+                                                                                    yieldUnescaped( description(assetSubItemL1) )
                                                                                     a(href: assetSubItemCreateWithParentLink(assetSubItemL1.id), onclick: onclickHideAndSavePane()) {
                                                                                         img(src: addImg(), alt: 'Add', title: 'Add Sub Item')
@@ -209 +225 @@
                                                                                                         img(src: dashImg())
                                                                                                     a( href: assetSubItemShowLink(assetSubItemL2.id), onclick: onclickHideAndSavePane() ) {
-                                                                                                        yieldUnescaped( assetSubItemL2.encodeAsHTML() )
+                                                                                                        yieldUnescaped( name(assetSubItemL2) )
                                                                                                     }
+                                                                                                    yieldUnescaped( description(assetSubItemL2) )
                                                                                                     a(href: assetSubItemCreateWithParentLink(assetSubItemL2.id), onclick: onclickHideAndSavePane()) {
                                                                                                         img(src: addImg(), alt: 'Add', title: 'Add Sub Item')
@@ -229 +246 @@
                                                                                                                         img(src: dashImg())
                                                                                                                     a( href: assetSubItemShowLink(assetSubItemL3.id), onclick: onclickHideAndSavePane() ) {
-                                                                                                                        yieldUnescaped( assetSubItemL3.encodeAsHTML() )
+                                                                                                                        yieldUnescaped( name(assetSubItemL3) )
                                                                                                                     }
+                                                                                                                    yieldUnescaped( description(assetSubItemL3) )
                                                                                                                     a(href: assetSubItemCreateWithParentLink(assetSubItemL3.id), onclick: onclickHideAndSavePane()) {
                                                                                                                         img(src: addImg(), alt: 'Add', title: 'Add Sub Item')
@@ -249 +267 @@
                                                                                                                                     img(src: dashImg())
                                                                                                                                     a( href: assetSubItemShowLink(assetSubItemL4.id), onclick: onclickHideAndSavePane() ) {
-                                                                                                                                        yieldUnescaped( assetSubItemL4.encodeAsHTML() )
+                                                                                                                                        yieldUnescaped( name(assetSubItemL4) )
                                                                                                                                     }
+                                                                                                                                    yieldUnescaped( description(assetSubItemL4) )
             //                                                                                                                         a(href: assetSubItemCreateWithParentLink(assetSubItemL4.id), onclick: onclickHideAndSavePane()) {
             //                                                                                                                             img(src: addImg(), alt: 'Add', title: 'Add Sub Item')