Changeset 249 for trunk

Timestamp:

Dec 27, 2009, 9:56:42 PM (15 years ago)

Author:

gav

Message:

Refactor AssignedPerson to use a serviced controller.

Location:

trunk/grails-app

Files:

• controllers/AssignedPersonDetailedController.groovy (modified) (2 diffs)
• i18n/messages.properties (modified) (1 diff)
• services/AssignedPersonService.groovy (added)
• views/assignedPersonDetailed/create.gsp (modified) (1 diff)
• views/assignedPersonDetailed/edit.gsp (modified) (1 diff)
• views/assignedPersonDetailed/show.gsp (modified) (1 diff)
• views/taskDetailed/show.gsp (modified) (1 diff)

trunk/grails-app/controllers/AssignedPersonDetailedController.groovy

@@ -3 +3 @@
 class AssignedPersonDetailedController extends BaseController {
 
-    def index = { redirect(action:list,params:params) }
+    def assignedPersonService
+
+    def index = {
+        flash.message = g.message(code: "assignedPerson.task.not.found")
+        redirect(controller:"taskDetailed", action:"search")
+    }
 
     // the delete, save and update actions only accept POST requests
@@ -9 +14 @@
 
     def list = {
-        params.max = Math.min( params.max ? params.max.toInteger() : 10,  100)
-        [ assignedPersonInstanceList: AssignedPerson.list( params ), assignedPersonInstanceTotal: AssignedPerson.count() ]
+            def result = assignedPersonService.list(params)
+            if(!result.error) {
+                return [ assignedPersonInstanceList: result.assignedPersonInstanceList,
+                                assignedPersonInstanceTotal: result.assignedPersonInstanceTotal ]
+            }
+
+            flash.message = g.message(code: result.error.code, args: result.error.args)
+            redirect( controller: "appCore", action: "start" )
     }
 
     def show = {
-        def assignedPersonInstance = AssignedPerson.get( params.id )
+        def result = assignedPersonService.show(params)
 
-        if(!assignedPersonInstance) {
-            flash.message = "AssignedPerson not found with id ${params.id}"
-            redirect(action:list)
-        }
-        else { return [ assignedPersonInstance : assignedPersonInstance ] }
+        if(!result.error)
+            return [ assignedPersonInstance: result.assignedPersonInstance ]
+
+        flash.message = g.message(code: result.error.code, args: result.error.args)
+
+        if(params.task?.id)
+            redirect(controller:"taskDetailed", action:"show", id: params.task.id)
+
+        redirect(controller:"taskDetailed", action:"search")
     }
 
     def delete = {
-        def assignedPersonInstance = AssignedPerson.get( params.id )
-        if(assignedPersonInstance) {
-            try {
-                def taskId = assignedPersonInstance.task.id
-                assignedPersonInstance.delete()
-                flash.message = "AssignedPerson ${params.id} deleted"
-                redirect(controller:"taskDetailed", action:"show", id: taskId)
-            }
-            catch(org.springframework.dao.DataIntegrityViolationException e) {
-                flash.message = "AssignedPerson ${params.id} could not be deleted"
-                redirect(action:show,id:params.id)
-            }
+        def result = assignedPersonService.delete(params)
+
+        if(!result.error) {
+            flash.message = g.message(code: "default.delete.success", args: ["AssignedPerson", params.id])
+            redirect(controller:"taskDetailed", action:"show", id: params.task?.id)
+            return
         }
-        else {
-            flash.message = "AssignedPerson not found with id ${params.id}"
-            redirect(action:list)
+
+        flash.message = g.message(code: result.error.code, args: result.error.args)
+
+        if(result.error.code == "default.not.found") {
+            redirect(controller:"taskDetailed", action:"show", id: params.task?.id)
+            return
         }
+
+        redirect(action:show, id: params.id)
     }
 
     def edit = {
-        def assignedPersonInstance = AssignedPerson.get( params.id )
+        def result = assignedPersonService.edit(params)
 
-        if(!assignedPersonInstance) {
-            flash.message = "AssignedPerson not found with id ${params.id}"
-            redirect(action:list)
-        }
-        else {
-            return [ assignedPersonInstance : assignedPersonInstance ]
-        }
+        if(!result.error)
+            return [ assignedPersonInstance : result.assignedPersonInstance ]
+
+        flash.message = g.message(code: result.error.code, args: result.error.args)
+
+        redirect(controller:"taskDetailed", action:"show", id: params.task?.id)
+
     }
 
     def update = {
-        def assignedPersonInstance = AssignedPerson.get( params.id )
-        if(assignedPersonInstance) {
-            if(params.version) {
-                def version = params.version.toLong()
-                if(assignedPersonInstance.version > version) {
+        def result = assignedPersonService.update(params)
 
-                    assignedPersonInstance.errors.rejectValue("version", "assignedPerson.optimistic.locking.failure", "Another user has updated this AssignedPerson while you were editing.")
-                    render(view:'edit',model:[assignedPersonInstance:assignedPersonInstance])
-                    return
-                }
-            }
-            assignedPersonInstance.properties = params
-            if(!assignedPersonInstance.hasErrors() && assignedPersonInstance.save(flush: true)) {
-                flash.message = "AssignedPerson ${params.id} updated"
-                redirect(action:show,id:assignedPersonInstance.id)
-            }
-            else {
-                render(view:'edit',model:[assignedPersonInstance:assignedPersonInstance])
-            }
+        if(!result.error) {
+            flash.message = g.message(code: "default.update.success", args: ["AssignedPerson", params.id])
+            redirect(action:show, id: params.id)
+            return
         }
-        else {
-            flash.message = "AssignedPerson not found with id ${params.id}"
-            redirect(action:edit,id:params.id)
+
+        if(result.error.code == "default.not.found") {
+            flash.message = g.message(code: result.error.code, args: result.error.args)
+            redirect(controller:"taskDetailed", action:"show", id: params.task?.id)
+            return
         }
+
+        render(view:'edit', model:[assignedPersonInstance: result.assignedPersonInstance.attach()])
     }
 
     def create = {
-        if(!params.task?.id) {
-            flash.message = "Please select a task and then 'Add Assigned Person'"
-            redirect(controller: "taskDetailed", action: search)
+        def result = assignedPersonService.create(params)
+
+        if(!result.error)
+            return [assignedPersonInstance: result.assignedPersonInstance]
+
+        if(result.error.code == "assignedPerson.task.not.found") {
+            flash.message = g.message(code: result.error.code, args: result.error.args)
+            redirect(controller: "taskDetailed", action: "search")
+            return
         }
-        else {
-            def assignedPersonInstance = new AssignedPerson()
-            assignedPersonInstance.properties = params
-            return ['assignedPersonInstance':assignedPersonInstance]
-        }
+
+        flash.message = g.message(code: result.error.code, args: result.error.args)
+        redirect(controller:"taskDetailed", action:"show", id: params.task?.id)
     }
 
     def save = {
-        def assignedPersonInstance = new AssignedPerson(params)
+        def result = assignedPersonService.save(params)
 
-        if(!assignedPersonInstance.hasErrors() && assignedPersonInstance.save(flush: true)) {
-            flash.message = "AssignedPerson ${assignedPersonInstance.id} created"
-            redirect(controller:"taskDetailed", action:"show", id: params.task.id)
+        if(!result.error) {
+            flash.message = g.message(code: "default.create.success", args: ["AssignedPerson", result.assignedPersonInstance.id])
+            redirect(controller:"taskDetailed", action:"show", id: result.assignedPersonInstance.task.id)
+            return
         }
-        else {
-            render(view:'create',model:[assignedPersonInstance:assignedPersonInstance])
-        }
+
+        render(view:'edit', model:[assignedPersonInstance: result.assignedPersonInstance])
     }
+
 }

trunk/grails-app/i18n/messages.properties

@@ -95 +95 @@
 
 assignedGroup.task.not.found=Please select a task and then ''Add Assigned Group''.
+assignedPerson.task.not.found=Please select a task and then ''Add Assigned Person''.
 
 default.list.failure=Could not generate list for class {0}.

trunk/grails-app/views/assignedPersonDetailed/create.gsp

@@ -21 +21 @@
             </g:hasErrors>
             <g:form action="save" method="post" >
-                <input type="hidden"  name="task.id" value="${assignedPersonInstance?.task?.id}" />
+                <g:hiddenField name="task.id" value="${assignedPersonInstance?.task?.id}" />
                 <div class="dialog">
                     <table>

trunk/grails-app/views/assignedPersonDetailed/edit.gsp

@@ -21 +21 @@
             </g:hasErrors>
             <g:form method="post" >
-                <input type="hidden" name="id" value="${assignedPersonInstance?.id}" />
-                <input type="hidden" name="version" value="${assignedPersonInstance?.version}" />
+                <g:hiddenField name="id" value="${assignedPersonInstance?.id}" />
+                <g:hiddenField name="task.id" value="${assignedPersonInstance?.task?.id}" />
+                <g:hiddenField name="version" value="${assignedPersonInstance?.version}" />
                 <div class="dialog">
                     <table>

trunk/grails-app/views/assignedPersonDetailed/show.gsp

@@ -51 +51 @@
             <div class="buttons">
                 <g:form>
-                    <input type="hidden" name="id" value="${assignedPersonInstance?.id}" />
+                    <g:hiddenField name="id" value="${assignedPersonInstance?.id}" />
+                    <g:hiddenField name="task.id" value="${assignedPersonInstance?.task?.id}" />
                     <span class="button"><g:actionSubmit class="edit" value="Edit" /></span>
                     <span class="button"><g:actionSubmit class="delete" onclick="return confirm('Are you sure?');" value="Delete" /></span>

trunk/grails-app/views/taskDetailed/show.gsp

@@ -204 +204 @@
                                             <ul>
                                             <g:each var="a" in="${taskInstance.assignedPersons}">
-                                                <li><g:link controller="assignedPersonDetailed" action="edit" id="${a.id}">${a?.encodeAsHTML()}</g:link></li>
+                                                <li><g:link controller="assignedPersonDetailed" action="edit" id="${a.id}" params="['task.id':taskInstance.id]">${a?.encodeAsHTML()}</g:link></li>
                                             </g:each>
                                             </ul>
-                                            <g:link controller="assignedPersonDetailed" params="['task.id':taskInstance?.id]" action="create">Add Assigned Person</g:link>
+                                            <g:link controller="assignedPersonDetailed" action="create" params="['task.id':taskInstance?.id]">Add Assigned Person</g:link>
                                         </td>