Changeset 695 for trunk

Timestamp:

Oct 18, 2010, 4:02:15 PM (14 years ago)

Author:

gav

Message:

Svn move "Equipment Register" report to "Equipment Register OH&S".

Location:

trunk

Files:

• grails-app/controllers/ReportController.groovy (modified) (2 diffs)
• grails-app/views/appCore/start.gsp (modified) (1 diff)
• web-app/reports/equipmentRegisterOhs.jrxml (moved) (moved from trunk/web-app/reports/equipmentRegister.jrxml)

trunk/grails-app/controllers/ReportController.groovy

@@ -173 +173 @@
     } // assetRegister
 
-    def equipmentRegister = {
-
-        params.reportTitle = "Equipment Register"
+    def equipmentRegisterOhs = {
+
+        params.reportTitle = "Equipment Register OH&S"
         params.logoUrl = grailsApplication.mainContext.getResource('images/logo.png').getURL()
         params.currentUser = authService.currentUser
@@ -190 +190 @@
 //         }
 
-    } // equipmentRegister
+    } // equipmentRegisterOhs
 
     def inventoryValueDetailedGsp = {

trunk/grails-app/views/appCore/start.gsp

@@ -161 +161 @@
                                             <br />
                                             <g:jasperReport controller="report"
-                                                                            action="equipmentRegister"
-                                                                            jasper="equipmentRegister"
-                                                                            name="Equipment Register"
+                                                                            action="equipmentRegisterOhs"
+                                                                            jasper="equipmentRegisterOhs"
+                                                                            name="Equipment Register (OH&amp;S)"
                                                                             format="PDF, XLS">
                                                 <g:select optionKey="id"