Merge branch 'i322-jobnotificationcopy-1.3' into release-1.3

rundeck · Jun 3, 2011 · 2ec51f5 · 2ec51f5
2 parents e44389e + 65c94b0
commit 2ec51f5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/rundeckapp/grails-app/domain/ScheduledExecution.groovy b/rundeckapp/grails-app/domain/ScheduledExecution.groovy
@@ -513,7 +513,7 @@ class ScheduledExecution extends ExecutionContext {
   }
 
     def Notification findNotification(String trigger, String type){
-        if(this.id){
+        if(this.notifications){
             return this.notifications.find{it.eventTrigger==trigger && it.type==type}
         }else{
             return null

diff --git a/rundeckapp/grails-app/views/scheduledExecution/_edit.gsp b/rundeckapp/grails-app/views/scheduledExecution/_edit.gsp
@@ -501,14 +501,14 @@ var applinks={
         </tr>
     </tbody>
     <tbody class="savedJobFields" style="${wdgt.styleVisible(if:wasSaved)}" >
-    <g:set var="defSuccess" value="${scheduledExecution.id?scheduledExecution.findNotification('onsuccess','email'):null}"/>
+    <g:set var="defSuccess" value="${scheduledExecution.findNotification('onsuccess','email')}"/>
     <g:set var="isSuccess" value="${params.notifySuccessRecipients && 'true'==params.notifyOnsuccess ||  defSuccess}"/>
-    <g:set var="defSuccessUrl" value="${scheduledExecution.id?scheduledExecution.findNotification('onsuccess','url'):null}"/>
+    <g:set var="defSuccessUrl" value="${scheduledExecution.findNotification('onsuccess','url')}"/>
     <g:set var="isSuccessUrl" value="${params.notifySuccessUrl && 'true'==params.notifyOnsuccessUrl ||  defSuccessUrl}"/>
 
-    <g:set var="defFailure" value="${scheduledExecution.id?scheduledExecution.findNotification('onfailure','email'):null}"/>
+    <g:set var="defFailure" value="${scheduledExecution.findNotification('onfailure','email')}"/>
     <g:set var="isFailure" value="${params.notifyFailureRecipients && 'true'==params.notifyOnfailure ||  defFailure}"/>
-    <g:set var="defFailureUrl" value="${scheduledExecution.id?scheduledExecution.findNotification('onfailure','url'):null}"/>
+    <g:set var="defFailureUrl" value="${scheduledExecution.findNotification('onfailure','url')}"/>
     <g:set var="isFailureUrl" value="${params.notifyFailureUrl && 'true'==params.notifyOnfailureUrl ||  defFailureUrl}"/>
     <tr>
         <td>