Correcly remove email notifications when unchecked [#291 state:resolved]

rundeck · May 19, 2011 · f16d3df · f16d3df
1 parent 8801b9c
commit f16d3df
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/rundeckapp/grails-app/controllers/ScheduledExecutionController.groovy b/rundeckapp/grails-app/controllers/ScheduledExecutionController.groovy
@@ -944,7 +944,7 @@ class ScheduledExecutionController  {
 
         }
 
-        if(!params.notifications && (params.notifyOnsuccess || params.notifyOnfailure)){
+        if(!params.notifications && (params.notifyOnsuccess || params.notifyOnfailure) && 'false'!=params.notified){
             def nots=[exists:true]
             if('true'==params.notifyOnsuccess){
                 nots['onsuccess']=[email:params.notifySuccessRecipients]
@@ -955,7 +955,7 @@ class ScheduledExecutionController  {
             params.notifications=nots
         }
         def todiscard=[]
-        if(params.notifications && scheduledExecution.notifications){
+        if('false'==params.notified || params.notifications && scheduledExecution.notifications || !(params.notifyOnsuccess || params.notifyOnfailure)){
             def todelete=[]
             scheduledExecution.notifications.each{Notification note->
                 todelete<<note