Fix broken job delete

* fix use of api response in bulkDelete * improve error message display
rundeck · Dec 13, 2013 · 73a4509 · 73a4509
1 parent 1794413
commit 73a4509
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 7 deletions.
diff --git a/rundeckapp/grails-app/controllers/rundeck/controllers/ScheduledExecutionController.groovy b/rundeckapp/grails-app/controllers/rundeck/controllers/ScheduledExecutionController.groovy
@@ -100,7 +100,7 @@ class ScheduledExecutionController  {
     private void error(){
         withFormat{
             html{
-                return render(template:"/common/error")
+                return render(view:"/common/error")
             }
             xml {
                 return xmlerror()
@@ -611,16 +611,31 @@ class ScheduledExecutionController  {
     /**
     */
     def delete = {
-        return deleteBulk(new ApiBulkJobDeleteRequest(ids: [params.id]))
+        if (!params.id) {
+            request.error = g.message(code: 'api.error.parameter.required',args:['id'])
+            response.setStatus(400)
+            return error()
+        }
+        def jobid=params.id
+        def Framework framework = frameworkService.getFrameworkFromUserSession(session, request)
+        def result = scheduledExecutionService.deleteScheduledExecutionById(jobid, framework, session.user, 'delete')
+        if (!result.success) {
+            request.error = result.error.message
+            return error()
+        } else {
+            flash.bulkDeleteResult = [success: [result.success]]
+            redirect(controller: 'menu', action: 'jobs')
+        }
     }
     /**
      * Delete a set of jobs as specified in the idlist parameter.
      * Only allowed via POST http method
      */
     def deleteBulk = {ApiBulkJobDeleteRequest deleteRequest ->
         log.debug("ScheduledExecutionController: deleteBulk : params: " + params)
-        if (!apiService.requireAnyParameters(params,response,['ids','idlist'])) {
-            return
+        if (!params.ids && !params.idlist) {
+            flash.error = g.message(code: 'ScheduledExecutionController.bulkDelete.empty')
+            return redirect(controller: 'menu', action: 'jobs')
         }
         def Framework framework = frameworkService.getFrameworkFromUserSession(session, request)
         def ids = new HashSet<String>()

diff --git a/rundeckapp/grails-app/i18n/messages.properties b/rundeckapp/grails-app/i18n/messages.properties
@@ -159,6 +159,7 @@ unauthorized.job.kill=You are not authorized to kill Jobs.
 unauthorized.job.delete=You are not authorized to delete this job
 unauthorized.project.create=You are not authorized to create a project. Ask your RunDeck admin to create one.
 ScheduledExecutionController.save.failed=Error saving Job
+ScheduledExecutionController.bulkDelete.empty=Select at least one Job to delete
 scheduledExecution.nodeset.empty.warning=Warning: The Node filters specified for this Job do not match any nodes, execution may fail.
 Workflow.strategy.label.node-first=Node-oriented
 Workflow.strategy.label.step-first=Step-oriented

diff --git a/rundeckapp/grails-app/views/menu/_workflowsFull.gsp b/rundeckapp/grails-app/views/menu/_workflowsFull.gsp
@@ -35,10 +35,20 @@
 
 <div id="${rkey}wffilterform">
         <g:if test="${flash.message}">
-            ${flash.message}
+            <div class="alert alert-dismissable alert-info">
+                <a class="close" data-dismiss="alert" href="#" aria-hidden="true">&times;</a>
+                <div>
+                    ${flash.message.encodeAsHTML()}
+                </div>
+            </div>
         </g:if>
         <g:if test="${flash.error}">
-            <span class="error note">${flash.error}</span>
+            <div class="alert alert-dismissable alert-warning">
+                <a class="close" data-dismiss="alert" href="#" aria-hidden="true">&times;</a>
+                <div>
+                    ${flash.error.encodeAsHTML()}
+                </div>
+            </div>
         </g:if>
     <g:set var="wasfiltered" value="${paginateParams?.keySet().grep(~/(?!proj).*Filter|groupPath|idlist$/)}"/>
     <g:if test="${params.createFilters}">

diff --git a/rundeckapp/grails-app/views/scheduledExecution/_editForm.gsp b/rundeckapp/grails-app/views/scheduledExecution/_editForm.gsp
@@ -20,7 +20,7 @@
 
                     <div class="modal-footer">
                         <g:form controller="scheduledExecution" action="delete" method="post">
-                            <g:hiddenField name="id" value="${scheduledExecution.id}"/>
+                            <g:hiddenField name="id" value="${scheduledExecution.extid}"/>
                             <button type="submit" class="btn btn-default btn-sm "
                                     data-dismiss="modal">
                                 Cancel