Changeset 247
- Timestamp:
- Dec 27, 2009, 8:13:08 PM (15 years ago)
- Location:
- trunk/grails-app
- Files:
-
- 1 added
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/grails-app/controllers/AssignedGroupDetailedController.groovy
r242 r247 3 3 class AssignedGroupDetailedController extends BaseController { 4 4 5 def index = { redirect(action:list,params:params) } 5 def assignedGroupService 6 7 def index = { 8 flash.message = g.message(code: "assignedGroup.task.not.found") 9 redirect(controller:"taskDetailed", action:"search") 10 } 6 11 7 12 // the delete, save and update actions only accept POST requests … … 9 14 10 15 def list = { 11 params.max = Math.min( params.max ? params.max.toInteger() : 10, 100) 12 [ assignedGroupInstanceList: AssignedGroup.list( params ), assignedGroupInstanceTotal: AssignedGroup.count() ] 16 def result = assignedGroupService.list(params) 17 if(!result.error) { 18 return [ assignedGroupInstanceList: result.assignedGroupInstanceList, 19 assignedGroupInstanceTotal: result.assignedGroupInstanceTotal ] 20 } 21 22 flash.message = g.message(code: result.error.code, args: result.error.args) 23 redirect( url: resource(dir:'') ) 13 24 } 14 25 15 26 def show = { 16 def assignedGroupInstance = AssignedGroup.get( params.id)27 def result = assignedGroupService.show(params) 17 28 18 if(!assignedGroupInstance) { 19 flash.message = "AssignedGroup not found with id ${params.id}" 20 redirect(action:list) 21 } 22 else { return [ assignedGroupInstance : assignedGroupInstance ] } 29 if(!result.error) 30 return [ assignedGroupInstance: result.assignedGroupInstance ] 31 32 flash.message = g.message(code: result.error.code, args: result.error.args) 33 34 if(params.task?.id) 35 redirect(controller:"taskDetailed", action:"show", id: params.task.id) 36 37 redirect(controller:"taskDetailed", action:"search") 23 38 } 24 39 25 40 def delete = { 26 def assignedGroupInstance = AssignedGroup.get( params.id ) 27 if(assignedGroupInstance) { 28 try { 29 def taskId = assignedGroupInstance.task.id 30 assignedGroupInstance.delete() 31 flash.message = "AssignedGroup ${params.id} deleted" 32 redirect(controller:"taskDetailed", action:"show", id: taskId) 33 } 34 catch(org.springframework.dao.DataIntegrityViolationException e) { 35 flash.message = "AssignedGroup ${params.id} could not be deleted" 36 redirect(action:show,id:params.id) 37 } 41 def result = assignedGroupService.delete(params) 42 43 if(!result.error) { 44 flash.message = g.message(code: "default.delete.success", args: ["AssignedGroup", params.id]) 45 redirect(controller:"taskDetailed", action:"show", id: params.task?.id) 46 return 38 47 } 39 else { 40 flash.message = "AssignedGroup not found with id ${params.id}" 41 redirect(action:list) 48 49 flash.message = g.message(code: result.error.code, args: result.error.args) 50 51 if(result.error.code == "default.not.found") { 52 redirect(controller:"taskDetailed", action:"show", id: params.task?.id) 53 return 42 54 } 55 56 redirect(action:show, id: params.id) 43 57 } 44 58 45 59 def edit = { 46 def assignedGroupInstance = AssignedGroup.get( params.id)60 def result = assignedGroupService.edit(params) 47 61 48 if(! assignedGroupInstance) {49 flash.message = "AssignedGroup not found with id ${params.id}"50 redirect(action:list) 51 }52 else { 53 return [ assignedGroupInstance : assignedGroupInstance ]54 } 62 if(!result.error) 63 return [ assignedGroupInstance : result.assignedGroupInstance ] 64 65 flash.message = g.message(code: result.error.code, args: result.error.args) 66 67 redirect(controller:"taskDetailed", action:"show", id: params.task?.id) 68 55 69 } 56 70 57 71 def update = { 58 def assignedGroupInstance = AssignedGroup.get( params.id ) 59 if(assignedGroupInstance) { 60 if(params.version) { 61 def version = params.version.toLong() 62 if(assignedGroupInstance.version > version) { 72 def result = assignedGroupService.update(params) 63 73 64 assignedGroupInstance.errors.rejectValue("version", "assignedGroup.optimistic.locking.failure", "Another user has updated this AssignedGroup while you were editing.") 65 render(view:'edit',model:[assignedGroupInstance:assignedGroupInstance]) 66 return 67 } 68 } 69 assignedGroupInstance.properties = params 70 if(!assignedGroupInstance.hasErrors() && assignedGroupInstance.save(flush: true)) { 71 flash.message = "AssignedGroup ${params.id} updated" 72 redirect(action:show,id:assignedGroupInstance.id) 73 } 74 else { 75 render(view:'edit',model:[assignedGroupInstance:assignedGroupInstance]) 76 } 74 if(!result.error) { 75 flash.message = g.message(code: "default.update.success", args: ["AssignedGroup", params.id]) 76 redirect(action:show, id: params.id) 77 return 77 78 } 78 else { 79 flash.message = "AssignedGroup not found with id ${params.id}" 80 redirect(action:edit,id:params.id) 79 80 if(result.error.code == "default.not.found") { 81 flash.message = g.message(code: result.error.code, args: result.error.args) 82 redirect(controller:"taskDetailed", action:"show", id: params.task?.id) 83 return 81 84 } 85 86 render(view:'edit', model:[assignedGroupInstance: result.assignedGroupInstance.attach()]) 82 87 } 83 88 84 89 def create = { 85 if(!params.task?.id) { 86 flash.message = "Please select a task and then 'Add Assigned Group'" 90 def result = assignedGroupService.create(params) 91 92 if(!result.error) 93 return [assignedGroupInstance: result.assignedGroupInstance] 94 95 if(result.error.code == "assignedGroup.task.not.found") { 96 flash.message = g.message(code: result.error.code, args: result.error.args) 87 97 redirect(controller: "taskDetailed", action: "search") 98 return 88 99 } 89 else { 90 def assignedGroupInstance = new AssignedGroup() 91 assignedGroupInstance.properties = params 92 return ['assignedGroupInstance':assignedGroupInstance] 93 } 100 101 flash.message = g.message(code: result.error.code, args: result.error.args) 102 redirect(controller:"taskDetailed", action:"show", id: params.task?.id) 94 103 } 95 104 96 105 def save = { 97 def assignedGroupInstance = new AssignedGroup(params)106 def result = assignedGroupService.save(params) 98 107 99 if(!assignedGroupInstance.hasErrors() && assignedGroupInstance.save(flush: true)) { 100 flash.message = "AssignedGroup ${assignedGroupInstance.id} created" 101 redirect(controller:"taskDetailed", action:"show", id: params.task.id) 108 if(!result.error) { 109 flash.message = g.message(code: "default.create.success", args: ["AssignedGroup", result.assignedGroupInstance.id]) 110 redirect(controller:"taskDetailed", action:"show", id: result.assignedGroupInstance.task.id) 111 return 102 112 } 103 else { 104 render(view:'create',model:[assignedGroupInstance:assignedGroupInstance]) 105 } 113 114 render(view:'edit', model:[assignedGroupInstance: result.assignedGroupInstance]) 106 115 } 116 107 117 } -
trunk/grails-app/i18n/messages.properties
r243 r247 94 94 inventoryMovement.inventoryItem.notFound=Inventory Item not found. 95 95 96 assignedGroup.task.not.found=Please select a task and then ''Add Assigned Group''. 97 98 default.list.failure=Could not generate list for class {0}. 99 default.not.found={0} {1} not found, it may have been deleted. 100 default.delete.success={0} {1} deleted. 101 default.delete.failure={0} {1} could not be deleted. 102 default.update.success={0} {1} updated. 103 default.update.failure={0} {1} could not be updated. 104 default.create.success={0} {1} created. 105 default.create.failure={0} {1} could not be created. 106 default.optimistic.locking.failure=Another user has updated this item while you were editing, please check the updated values. 107 96 108 default.doesnt.match.message=Property [{0}] of class [{1}] with value [{2}] does not match the required pattern [{3}] 97 109 default.invalid.url.message=Property [{0}] of class [{1}] with value [{2}] is not a valid URL … … 113 125 default.paginate.prev=Previous 114 126 default.paginate.next=Next 115 default.optimistic.locking.failure=Another user has updated this item while you were editing, please check the updated values.116 127 117 128 # Rich UI plugin - Calendar -
trunk/grails-app/views/assignedGroupDetailed/create.gsp
r242 r247 21 21 </g:hasErrors> 22 22 <g:form action="save" method="post" > 23 < input type="hidden"name="task.id" value="${assignedGroupInstance?.task?.id}" />23 <g:hiddenField name="task.id" value="${assignedGroupInstance?.task?.id}" /> 24 24 <div class="dialog"> 25 25 <table> -
trunk/grails-app/views/assignedGroupDetailed/edit.gsp
r242 r247 21 21 </g:hasErrors> 22 22 <g:form method="post" > 23 <input type="hidden" name="id" value="${assignedGroupInstance?.id}" /> 24 <input type="hidden" name="version" value="${assignedGroupInstance?.version}" /> 23 <g:hiddenField name="id" value="${assignedGroupInstance?.id}" /> 24 <g:hiddenField name="task.id" value="${assignedGroupInstance?.task?.id}" /> 25 <g:hiddenField name="version" value="${assignedGroupInstance?.version}" /> 25 26 <div class="dialog"> 26 27 <table> -
trunk/grails-app/views/assignedGroupDetailed/show.gsp
r242 r247 51 51 <div class="buttons"> 52 52 <g:form> 53 <input type="hidden" name="id" value="${assignedGroupInstance?.id}" /> 53 <g:hiddenField name="id" value="${assignedGroupInstance?.id}" /> 54 <g:hiddenField name="task.id" value="${assignedGroupInstance?.task?.id}" /> 54 55 <span class="button"><g:actionSubmit class="edit" value="Edit" /></span> 55 56 <span class="button"><g:actionSubmit class="delete" onclick="return confirm('Are you sure?');" value="Delete" /></span> -
trunk/grails-app/views/taskDetailed/edit.gsp
r246 r247 5 5 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> 6 6 <meta name="layout" content="main" /> 7 <title>Edit Task #${taskInstance .id}</title>7 <title>Edit Task #${taskInstance?.id}</title> 8 8 <nav:resources override="true"/> 9 9 <resource:dateChooser /> … … 36 36 </tr> 37 37 38 <g:if test="${taskInstance .parentTask}">38 <g:if test="${taskInstance?.parentTask}"> 39 39 <tr class="prop"> 40 40 <td valign="top" class="name">Parent Task:</td> … … 166 166 <ul> 167 167 <g:each var="a" in="${taskInstance?.assignedGroups?}"> 168 <li><g:link controller="assignedGroupDetailed" action="edit" id="${a.id}" >${a?.encodeAsHTML()}</g:link></li>168 <li><g:link controller="assignedGroupDetailed" action="edit" id="${a.id}" params="['task.id':taskInstance?.id]">${a?.encodeAsHTML()}</g:link></li> 169 169 </g:each> 170 170 </ul> … … 181 181 <ul> 182 182 <g:each var="a" in="${taskInstance?.assignedPersons?}"> 183 <li><g:link controller="assignedPersonDetailed" action="edit" id="${a.id}" >${a?.encodeAsHTML()}</g:link></li>183 <li><g:link controller="assignedPersonDetailed" action="edit" id="${a.id}" params="['task.id':taskInstance?.id]">${a?.encodeAsHTML()}</g:link></li> 184 184 </g:each> 185 185 </ul> -
trunk/grails-app/views/taskDetailed/show.gsp
r246 r247 189 189 <ul> 190 190 <g:each var="a" in="${taskInstance.assignedGroups}"> 191 <li><g:link controller="assignedGroupDetailed" action="edit" id="${a.id}" >${a?.encodeAsHTML()}</g:link></li>191 <li><g:link controller="assignedGroupDetailed" action="edit" id="${a.id}" params="['task.id':taskInstance.id]">${a?.encodeAsHTML()}</g:link></li> 192 192 </g:each> 193 193 </ul> 194 <g:link controller="assignedGroupDetailed" params="['task.id':taskInstance?.id]" action="create">Add Assigned Group</g:link>194 <g:link controller="assignedGroupDetailed" action="create" params="['task.id':taskInstance.id]">Add Assigned Group</g:link> 195 195 </td> 196 196 … … 462 462 <div class="buttons"> 463 463 <span class="button"> 464 <g:actionSubmit value=" Create" action="create" class="add"/>464 <g:actionSubmit value="Add" action="create" class="add"/> 465 465 </span> 466 466 </div> … … 664 664 </g:else> 665 665 <span class="button"><g:actionSubmit action="listSubTasks" class="table" value="List" /></span> 666 <span class="button"><g:actionSubmit action="createSubTask" class=" add" value="Create" /></span>666 <span class="button"><g:actionSubmit action="createSubTask" class="save" value="Create" /></span> 667 667 </g:form> 668 668 </div> … … 678 678 <g:form> 679 679 <g:hiddenField name="id" value="${taskInstance?.id}" /> 680 <span class="button"><g:actionSubmit action="createSubTask" class=" add" value="Create" /></span>680 <span class="button"><g:actionSubmit action="createSubTask" class="save" value="Create" /></span> 681 681 </g:form> 682 682 </div>
Note: See TracChangeset
for help on using the changeset viewer.