Changeset 573 for trunk/grails-app/controllers

Timestamp:

Jun 7, 2010, 12:33:16 PM (14 years ago)

Author:

gav

Message:

Small correction to MaintenanceActionController, since there is no list view.

File:

• trunk/grails-app/controllers/MaintenanceActionDetailedController.groovy (modified) (6 diffs)

trunk/grails-app/controllers/MaintenanceActionDetailedController.groovy

@@ -8 +8 @@
 
     @Secured(['ROLE_AppAdmin', 'ROLE_Manager', 'ROLE_AssetManager', 'ROLE_AssetUser'])
-    def index = { redirect(action:list,params:params) }
-
-    @Secured(['ROLE_AppAdmin', 'ROLE_Manager', 'ROLE_AssetManager', 'ROLE_AssetUser'])
-    def list = {
-        params.max = Math.min( params.max ? params.max.toInteger() : 10,  100)
-        [ maintenanceActionInstanceList: MaintenanceAction.list( params ), maintenanceActionInstanceTotal: MaintenanceAction.count() ]
-    }
-
-    @Secured(['ROLE_AppAdmin', 'ROLE_Manager', 'ROLE_AssetManager', 'ROLE_AssetUser'])
     def show = {
         def maintenanceActionInstance = MaintenanceAction.get( params.id )
@@ -22 +13 @@
         if(!maintenanceActionInstance) {
             flash.message = "MaintenanceAction not found with id ${params.id}"
-            redirect(action:list)
+            redirect(controller: "appCore", action:"start")
         }
         else { return [ maintenanceActionInstance : maintenanceActionInstance ] }
@@ -31 +22 @@
         if(maintenanceActionInstance) {
             try {
+                def taskProcedure = maintenanceActionInstance.taskProcedure
                 maintenanceActionInstance.delete(flush:true)
                 flash.message = "MaintenanceAction ${params.id} deleted"
-                redirect(action:list)
+                redirect(controller: "taskProcedureDetailed", action:"show", id:taskProcedure.id)
             }
             catch(org.springframework.dao.DataIntegrityViolationException e) {
@@ -42 +34 @@
         else {
             flash.message = "MaintenanceAction not found with id ${params.id}"
-            redirect(action:list)
+            redirect(controller: "appCore", action:"start")
         }
     }
@@ -51 +43 @@
         if(!maintenanceActionInstance) {
             flash.message = "MaintenanceAction not found with id ${params.id}"
-            redirect(action:list)
+            redirect(controller: "appCore", action:"start")
         }
         else {
@@ -81 +73 @@
         else {
             flash.message = "MaintenanceAction not found with id ${params.id}"
-            redirect(action:list)
+            redirect(controller: "appCore", action:"start")
         }
     }