Index: /trunk/grails-app/controllers/AppCoreController.groovy
===================================================================
--- /trunk/grails-app/controllers/AppCoreController.groovy (revision 686)
+++ /trunk/grails-app/controllers/AppCoreController.groovy (revision 687)
@@ -63,7 +63,10 @@
def plugins = pluginProperties.collect{ it.key + '-' + it.value }.join(", ")
+ def sections = Section.findAllByIsActive(true).sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) }
+
return [grailsVersion: grailsVersion,
applicationString: applicationString,
- plugins: plugins]
+ plugins: plugins,
+ sections: sections]
}
Index: /trunk/grails-app/controllers/ReportController.groovy
===================================================================
--- /trunk/grails-app/controllers/ReportController.groovy (revision 686)
+++ /trunk/grails-app/controllers/ReportController.groovy (revision 687)
@@ -144,8 +144,12 @@
params.logoUrl = grailsApplication.mainContext.getResource('images/logo.png').getURL()
params.currentUser = authService.currentUser
- if(params.asset.id == 'all')
- params.asset = "All"
- else
- params.asset = Asset.get(params.asset.id.toLong())
+ if(params.section.id == 'all') {
+ params.section = "All"
+ params.site = "All"
+ }
+ else {
+ params.section = Section.get(params.section.id.toLong())
+ params.site = params.section.site
+ }
def dataModel = assetReportService.getAssetDetail(params, RCU.getLocale(request))
Index: /trunk/grails-app/services/AssetReportService.groovy
===================================================================
--- /trunk/grails-app/services/AssetReportService.groovy (revision 686)
+++ /trunk/grails-app/services/AssetReportService.groovy (revision 687)
@@ -111,7 +111,7 @@
'left join asset.assetExtendedAttributes as attrib',
'left join attrib.extendedAttributeType as attribT'
- if(params.asset instanceof Asset) {
- namedParams.asset = params.asset
- where 'asset = :asset'
+ if(params.section instanceof Section) {
+ namedParams.section = params.section
+ where 'asset.section = :section'
}
order 'by asset.name asc, attribT.name asc'
Index: /trunk/grails-app/views/appCore/start.gsp
===================================================================
--- /trunk/grails-app/views/appCore/start.gsp (revision 686)
+++ /trunk/grails-app/views/appCore/start.gsp (revision 687)
@@ -143,6 +143,6 @@
format="PDF, XLS">
@@ -155,5 +155,5 @@
format="PDF, XLS">
@@ -166,5 +166,5 @@
format="PDF, XLS">
Index: /trunk/web-app/reports/assetDetail.jrxml
===================================================================
--- /trunk/web-app/reports/assetDetail.jrxml (revision 686)
+++ /trunk/web-app/reports/assetDetail.jrxml (revision 687)
@@ -39,8 +39,9 @@
-
+
+
@@ -86,7 +87,7 @@
-
-
-
+
+
+
@@ -99,11 +100,9 @@
-
-
-
+
-
-
-
+
+
+