Changeset 96 for trunk/src/grails-app/controllers

Timestamp:

Mar 31, 2009, 5:43:09 AM (16 years ago)

Author:

gav

Message:

Implemented the bulk of AssignedPerson? domain

Location:

trunk/src/grails-app/controllers

Files:

• AssignedPersonController.groovy (added)
• AssignedPersonDetailedController.groovy (added)
• BaseAppAdminController.groovy (added)
• TaskController.groovy (modified) (5 diffs)
• TaskDetailedController.groovy (modified) (3 diffs)

trunk/src/grails-app/controllers/TaskController.groovy

@@ -1 +1 @@
 import org.codehaus.groovy.grails.plugins.springsecurity.Secured
 
-@Secured(['ROLE_AppAdmin']) 
-class TaskController extends BaseController {
+class TaskController extends BaseAppAdminController {
     
     def index = { redirect(action:list,params:params) }
@@ -10 +9 @@
 
     def list = {
-        if(!params.max) params.max = 10
-        [ taskInstanceList: Task.list( params ) ]
+        params.max = Math.min( params.max ? params.max.toInteger() : 10,  100)
+        [ taskInstanceList: Task.list( params ), taskInstanceTotal: Task.count() ]
     }
+
     def show = {
         def taskInstance = Task.get( params.id )
@@ -22 +22 @@
         else { return [ taskInstance : taskInstance ] }
     }
-  
+
     def delete = {
         def taskInstance = Task.get( params.id )
         if(taskInstance) {
-            taskInstance.delete()
-            flash.message = "Task ${params.id} deleted"
-            redirect(action:list)
+            try {
+                taskInstance.delete()
+                flash.message = "Task ${params.id} deleted"
+                redirect(action:list)
+            }
+            catch(org.springframework.dao.DataIntegrityViolationException e) {
+                flash.message = "Task ${params.id} could not be deleted"
+                redirect(action:show,id:params.id)
+            }
         }
         else {
@@ -51 +57 @@
         def taskInstance = Task.get( params.id )
         if(taskInstance) {
+            if(params.version) {
+                def version = params.version.toLong()
+                if(taskInstance.version > version) {
+                    
+                    taskInstance.errors.rejectValue("version", "task.optimistic.locking.failure", "Another user has updated this Task while you were editing.")
+                    render(view:'edit',model:[taskInstance:taskInstance])
+                    return
+                }
+            }
             taskInstance.properties = params
             if(!taskInstance.hasErrors() && taskInstance.save()) {
@@ -82 +97 @@
         }
     }
-
 }

trunk/src/grails-app/controllers/TaskDetailedController.groovy

@@ -9 +9 @@
 
     def list = {
-        if(!params.max) params.max = 10
-        [ taskInstanceList: Task.list( params ) ]
+        params.max = Math.min( params.max ? params.max.toInteger() : 10,  100)
+        [ taskInstanceList: Task.list( params ), taskInstanceTotal: Task.count() ]
     }
 
@@ -26 +26 @@
         def taskInstance = Task.get( params.id )
         if(taskInstance) {
-            taskInstance.delete()
-            flash.message = "Task ${params.id} deleted"
-            redirect(action:list)
+            try {
+                taskInstance.delete()
+                flash.message = "Task ${params.id} deleted"
+                redirect(action:list)
+            }
+            catch(org.springframework.dao.DataIntegrityViolationException e) {
+                flash.message = "Task ${params.id} could not be deleted"
+                redirect(action:show,id:params.id)
+            }
         }
         else {
@@ -57 +63 @@
         def taskInstance = Task.get( params.id )
         if(taskInstance) {
+            if(params.version) {
+                def version = params.version.toLong()
+                if(taskInstance.version > version) {
+                    
+                    taskInstance.errors.rejectValue("version", "task.optimistic.locking.failure", "Another user has updated this Task while you were editing.")
+                    render(view:'edit',model:[taskInstance:taskInstance])
+                    return
+                }
+            }
             taskInstance.properties = params
             if(!taskInstance.hasErrors() && taskInstance.save()) {