Merge branch 'issue55' of http://github.com/gschueler/rundeck into gs…

…-issue55
rundeck · Oct 30, 2010 · d4729e6 · d4729e6
2 parents 5e67e18 + 22a14d3
commit d4729e6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/rundeckapp/grails-app/controllers/FrameworkController.groovy b/rundeckapp/grails-app/controllers/FrameworkController.groovy
@@ -260,6 +260,12 @@ class FrameworkController  {
         def NodeFilter filter
         def boolean saveuser=false
         if(params.newFilterName && !params.existsFilterName){
+            def ofilter = NodeFilter.findByNameAndUser(params.newFilterName,u)
+            if(ofilter){
+                flash.error="Filter named ${params.newFilterName} already exists."
+                params.saveFilter=true
+                return chain(controller:'framework',action:'nodes',params:params)
+            }
             filter= new NodeFilter(query.properties)
             filter.name=params.newFilterName
             u.addToNodefilters(filter)
@@ -272,12 +278,12 @@ class FrameworkController  {
         }else if(!params.newFilterName && !params.existsFilterName){
             flash.error="Filter name not specified"
             params.saveFilter=true
-            chain(controller:'reports',action:'index',params:params)
+            return chain(controller:'framework',action:'nodes',params:params)
         }
         if(!filter.save(flush:true)){
             flash.error=filter.errors.allErrors.collect { g.message(error:it) }.join("\n")
             params.saveFilter=true
-            chain(controller:'reports',action:'index',params:params)
+            return chain(controller:'framework',action:'nodes',params:params)
         }
         if(saveuser){
             if(!u.save(flush:true)){

diff --git a/rundeckapp/grails-app/domain/NodeFilter.groovy b/rundeckapp/grails-app/domain/NodeFilter.groovy
@@ -45,7 +45,7 @@ public class NodeFilter {
 
     static belongsTo = [user:User]
     static constraints={
-        name(blank:false,unique:true)
+        name(blank:false)
         nodeInclude(nullable: true)
         nodeExclude(nullable: true)
         nodeIncludeName(nullable: true)