Use jobFilter as job/group match by default #273

rundeck · Jan 15, 2013 · 6cdb7b3 · 6cdb7b3
1 parent ea98b0c
commit 6cdb7b3
Showing 1 changed file with 15 additions and 4 deletions.
diff --git a/rundeckapp/grails-app/services/rundeck/services/ReportService.groovy b/rundeckapp/grails-app/services/rundeck/services/ReportService.groovy
@@ -160,10 +160,12 @@ class ReportService  {
     def getCombinedReports(ReportQuery query) {
         def eqfilters = getEqFilters()
         def txtfilters = getTxtFilters()
+        def startfilters = getStartsWithFilters()
 
         def filters = [ :]
         filters.putAll(txtfilters)
         filters.putAll(eqfilters)
+        filters.putAll(startfilters)
 
 
         def crit = BaseReport.createCriteria()
@@ -207,6 +209,12 @@ class ReportService  {
             ]
 	}
 
+    private def getStartsWithFilters() {
+        return [
+            //job filter repurposed for reportId
+            job: 'reportId',
+        ]
+    }
     private def getTxtFilters() {
         def txtfilters = [
             obj: 'ctxName',
@@ -217,8 +225,6 @@ class ReportService  {
             abortedBy: 'abortedByUser',
             node: 'node',
             message: 'message',
-            //job filter repurposed for reportId 
-            job: 'reportId',
             title: 'title',
             tags: 'tags',
         ]
@@ -240,8 +246,6 @@ class ReportService  {
      * Count the query results matching the filter
      */
     def countCombinedReports(ReportQuery query) {
-        def eqfilters = getEqFilters()
-        def txtfilters = getTxtFilters()
 
         def total = BaseReport.createCriteria().count {
 
@@ -260,6 +264,7 @@ class ReportService  {
     private applyReportsCriteria(ReportQuery query, delegate){
         def eqfilters = getEqFilters()
         def txtfilters = getTxtFilters()
+        def startFilters = getStartsWithFilters()
         delegate.with{
 
             if (query) {
@@ -268,6 +273,12 @@ class ReportService  {
                         ilike(val, '%' + query["${key}Filter"] + '%')
                     }
                 }
+                startFilters.each { key, val ->
+                    def qval = query["${key}Filter"]
+                    if (qval) {
+                        ilike(val, qval.contains('%') ? qval : (qval + (qval.endsWith('/')? '%': '/%')))
+                    }
+                }
 
                 eqfilters.each {key, val ->
                     if (query["${key}Filter"] == 'null') {