Changeset 247

Timestamp:

Dec 27, 2009, 8:13:08 PM (14 years ago)

Author:

gav

Message:

Refactor AssignedGroup to use a serviced controller.

Location:

trunk/grails-app

Files:

• controllers/AssignedGroupDetailedController.groovy (modified) (2 diffs)
• i18n/messages.properties (modified) (2 diffs)
• services/AssignedGroupService.groovy (added)
• views/assignedGroupDetailed/create.gsp (modified) (1 diff)
• views/assignedGroupDetailed/edit.gsp (modified) (1 diff)
• views/assignedGroupDetailed/show.gsp (modified) (1 diff)
• views/taskDetailed/edit.gsp (modified) (4 diffs)
• views/taskDetailed/show.gsp (modified) (4 diffs)

trunk/grails-app/controllers/AssignedGroupDetailedController.groovy

@@ -3 +3 @@
 class AssignedGroupDetailedController extends BaseController {
 
-    def index = { redirect(action:list,params:params) }
+    def assignedGroupService
+
+    def index = {
+        flash.message = g.message(code: "assignedGroup.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)
-        [ assignedGroupInstanceList: AssignedGroup.list( params ), assignedGroupInstanceTotal: AssignedGroup.count() ]
+            def result = assignedGroupService.list(params)
+            if(!result.error) {
+                return [ assignedGroupInstanceList: result.assignedGroupInstanceList,
+                                assignedGroupInstanceTotal: result.assignedGroupInstanceTotal ]
+            }
+
+            flash.message = g.message(code: result.error.code, args: result.error.args)
+            redirect( url: resource(dir:'') )
     }
 
     def show = {
-        def assignedGroupInstance = AssignedGroup.get( params.id )
+        def result = assignedGroupService.show(params)
 
-        if(!assignedGroupInstance) {
-            flash.message = "AssignedGroup not found with id ${params.id}"
-            redirect(action:list)
-        }
-        else { return [ assignedGroupInstance : assignedGroupInstance ] }
+        if(!result.error)
+            return [ assignedGroupInstance: result.assignedGroupInstance ]
+
+        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 assignedGroupInstance = AssignedGroup.get( params.id )
-        if(assignedGroupInstance) {
-            try {
-                def taskId = assignedGroupInstance.task.id
-                assignedGroupInstance.delete()
-                flash.message = "AssignedGroup ${params.id} deleted"
-                redirect(controller:"taskDetailed", action:"show", id: taskId)
-            }
-            catch(org.springframework.dao.DataIntegrityViolationException e) {
-                flash.message = "AssignedGroup ${params.id} could not be deleted"
-                redirect(action:show,id:params.id)
-            }
+        def result = assignedGroupService.delete(params)
+
+        if(!result.error) {
+            flash.message = g.message(code: "default.delete.success", args: ["AssignedGroup", params.id])
+            redirect(controller:"taskDetailed", action:"show", id: params.task?.id)
+            return
         }
-        else {
-            flash.message = "AssignedGroup 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 assignedGroupInstance = AssignedGroup.get( params.id )
+        def result = assignedGroupService.edit(params)
 
-        if(!assignedGroupInstance) {
-            flash.message = "AssignedGroup not found with id ${params.id}"
-            redirect(action:list)
-        }
-        else {
-            return [ assignedGroupInstance : assignedGroupInstance ]
-        }
+        if(!result.error)
+            return [ assignedGroupInstance : result.assignedGroupInstance ]
+
+        flash.message = g.message(code: result.error.code, args: result.error.args)
+
+        redirect(controller:"taskDetailed", action:"show", id: params.task?.id)
+
     }
 
     def update = {
-        def assignedGroupInstance = AssignedGroup.get( params.id )
-        if(assignedGroupInstance) {
-            if(params.version) {
-                def version = params.version.toLong()
-                if(assignedGroupInstance.version > version) {
+        def result = assignedGroupService.update(params)
 
-                    assignedGroupInstance.errors.rejectValue("version", "assignedGroup.optimistic.locking.failure", "Another user has updated this AssignedGroup while you were editing.")
-                    render(view:'edit',model:[assignedGroupInstance:assignedGroupInstance])
-                    return
-                }
-            }
-            assignedGroupInstance.properties = params
-            if(!assignedGroupInstance.hasErrors() && assignedGroupInstance.save(flush: true)) {
-                flash.message = "AssignedGroup ${params.id} updated"
-                redirect(action:show,id:assignedGroupInstance.id)
-            }
-            else {
-                render(view:'edit',model:[assignedGroupInstance:assignedGroupInstance])
-            }
+        if(!result.error) {
+            flash.message = g.message(code: "default.update.success", args: ["AssignedGroup", params.id])
+            redirect(action:show, id: params.id)
+            return
         }
-        else {
-            flash.message = "AssignedGroup 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:[assignedGroupInstance: result.assignedGroupInstance.attach()])
     }
 
     def create = {
-        if(!params.task?.id) {
-            flash.message = "Please select a task and then 'Add Assigned Group'"
+        def result = assignedGroupService.create(params)
+
+        if(!result.error)
+            return [assignedGroupInstance: result.assignedGroupInstance]
+
+        if(result.error.code == "assignedGroup.task.not.found") {
+            flash.message = g.message(code: result.error.code, args: result.error.args)
             redirect(controller: "taskDetailed", action: "search")
+            return
         }
-        else {
-            def assignedGroupInstance = new AssignedGroup()
-            assignedGroupInstance.properties = params
-            return ['assignedGroupInstance':assignedGroupInstance]
-        }
+
+        flash.message = g.message(code: result.error.code, args: result.error.args)
+        redirect(controller:"taskDetailed", action:"show", id: params.task?.id)
     }
 
     def save = {
-        def assignedGroupInstance = new AssignedGroup(params)
+        def result = assignedGroupService.save(params)
 
-        if(!assignedGroupInstance.hasErrors() && assignedGroupInstance.save(flush: true)) {
-            flash.message = "AssignedGroup ${assignedGroupInstance.id} created"
-            redirect(controller:"taskDetailed", action:"show", id: params.task.id)
+        if(!result.error) {
+            flash.message = g.message(code: "default.create.success", args: ["AssignedGroup", result.assignedGroupInstance.id])
+            redirect(controller:"taskDetailed", action:"show", id: result.assignedGroupInstance.task.id)
+            return
         }
-        else {
-            render(view:'create',model:[assignedGroupInstance:assignedGroupInstance])
-        }
+
+        render(view:'edit', model:[assignedGroupInstance: result.assignedGroupInstance])
     }
+
 }

trunk/grails-app/i18n/messages.properties

@@ -94 +94 @@
 inventoryMovement.inventoryItem.notFound=Inventory Item not found.
 
+assignedGroup.task.not.found=Please select a task and then ''Add Assigned Group''.
+
+default.list.failure=Could not generate list for class {0}.
+default.not.found={0} {1} not found, it may have been deleted.
+default.delete.success={0} {1} deleted.
+default.delete.failure={0} {1} could not be deleted.
+default.update.success={0} {1} updated.
+default.update.failure={0} {1} could not be updated.
+default.create.success={0} {1} created.
+default.create.failure={0} {1} could not be created.
+default.optimistic.locking.failure=Another user has updated this item while you were editing, please check the updated values.
+
 default.doesnt.match.message=Property [{0}] of class [{1}] with value [{2}] does not match the required pattern [{3}]
 default.invalid.url.message=Property [{0}] of class [{1}] with value [{2}] is not a valid URL
@@ -113 +125 @@
 default.paginate.prev=Previous
 default.paginate.next=Next
-default.optimistic.locking.failure=Another user has updated this item while you were editing, please check the updated values.
 
 # Rich UI plugin - Calendar

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

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

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

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

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

@@ -51 +51 @@
             <div class="buttons">
                 <g:form>
-                    <input type="hidden" name="id" value="${assignedGroupInstance?.id}" />
+                    <g:hiddenField name="id" value="${assignedGroupInstance?.id}" />
+                    <g:hiddenField name="task.id" value="${assignedGroupInstance?.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/edit.gsp

@@ -5 +5 @@
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
         <meta name="layout" content="main" />
-        <title>Edit Task #${taskInstance.id}</title>
+        <title>Edit Task #${taskInstance?.id}</title>
         <nav:resources override="true"/>
         <resource:dateChooser />
@@ -36 +36 @@
                             </tr>
 
-                            <g:if test="${taskInstance.parentTask}">
+                            <g:if test="${taskInstance?.parentTask}">
                                 <tr class="prop">
                                     <td valign="top" class="name">Parent Task:</td>
@@ -166 +166 @@
                                 <ul>
                                 <g:each var="a" in="${taskInstance?.assignedGroups?}">
-                                    <li><g:link controller="assignedGroupDetailed" action="edit" id="${a.id}">${a?.encodeAsHTML()}</g:link></li>
+                                    <li><g:link controller="assignedGroupDetailed" action="edit" id="${a.id}" params="['task.id':taskInstance?.id]">${a?.encodeAsHTML()}</g:link></li>
                                 </g:each>
                                 </ul>
@@ -181 +181 @@
                                 <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>

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

@@ -189 +189 @@
                                             <ul>
                                             <g:each var="a" in="${taskInstance.assignedGroups}">
-                                                <li><g:link controller="assignedGroupDetailed" action="edit" id="${a.id}">${a?.encodeAsHTML()}</g:link></li>
+                                                <li><g:link controller="assignedGroupDetailed" action="edit" id="${a.id}" params="['task.id':taskInstance.id]">${a?.encodeAsHTML()}</g:link></li>
                                             </g:each>
                                             </ul>
-                                            <g:link controller="assignedGroupDetailed" params="['task.id':taskInstance?.id]" action="create">Add Assigned Group</g:link>
+                                            <g:link controller="assignedGroupDetailed" action="create" params="['task.id':taskInstance.id]">Add Assigned Group</g:link>
                                         </td>
 
@@ -462 +462 @@
                                 <div class="buttons">
                                     <span class="button">
-                                        <g:actionSubmit value="Create" action="create"  class="add"/>
+                                        <g:actionSubmit value="Add" action="create"  class="add"/>
                                     </span>
                                 </div>
@@ -664 +664 @@
                                     </g:else>
                                     <span class="button"><g:actionSubmit action="listSubTasks" class="table" value="List" /></span>
-                                    <span class="button"><g:actionSubmit action="createSubTask" class="add" value="Create" /></span>
+                                    <span class="button"><g:actionSubmit action="createSubTask" class="save" value="Create" /></span>
                                 </g:form>
                             </div>
@@ -678 +678 @@
                                 <g:form>
                                     <g:hiddenField name="id" value="${taskInstance?.id}" />
-                                    <span class="button"><g:actionSubmit action="createSubTask" class="add" value="Create" /></span>
+                                    <span class="button"><g:actionSubmit action="createSubTask" class="save" value="Create" /></span>
                                 </g:form>
                             </div>