Changeset 1188

Timestamp:

Nov 23, 2010, 9:47:15 AM (11 years ago)

Author:

robert@…

Message:

Fixed deletion of studies (see ticket #201)

Location:

trunk/grails-app

Files:

• controllers/dbnp/studycapturing/StudyController.groovy (modified) (2 diffs)
• views/study/show.gsp (modified) (1 diff)

trunk/grails-app/controllers/dbnp/studycapturing/StudyController.groovy

@@ -202 +202 @@
     }
 
+    def delete = {
+        def studyInstance = Study.get(params.id)
+        if (studyInstance) {
+            try {
+                studyInstance.delete(flush: true)
+                flash.message = "${message(code: 'default.deleted.message', args: [message(code: 'study.label', default: 'Study'), params.id])}"
+                redirect(action: "list")
+            }
+            catch (org.springframework.dao.DataIntegrityViolationException e) {
+                flash.message = "${message(code: 'default.not.deleted.message', args: [message(code: 'study.label', default: 'Study'), params.id])}"
+                redirect(action: "show", id: params.id)
+            }
+        }
+        else {
+            flash.message = "${message(code: 'default.not.found.message', args: [message(code: 'study.label', default: 'Study'), params.id])}"
+            redirect(action: "list")
+        }
+    }
+
     /*def edit = {
         def studyInstance = Study.get(params.id)
@@ -239 +258 @@
         }
     }
-
-    def delete = {
-        def studyInstance = Study.get(params.id)
-        if (studyInstance) {
-            try {
-                studyInstance.delete(flush: true)
-                flash.message = "${message(code: 'default.deleted.message', args: [message(code: 'study.label', default: 'Study'), params.id])}"
-                redirect(action: "list")
-            }
-            catch (org.springframework.dao.DataIntegrityViolationException e) {
-                flash.message = "${message(code: 'default.not.deleted.message', args: [message(code: 'study.label', default: 'Study'), params.id])}"
-                redirect(action: "show", id: params.id)
-            }
-        }
-        else {
-            flash.message = "${message(code: 'default.not.found.message', args: [message(code: 'study.label', default: 'Study'), params.id])}"
-            redirect(action: "list")
-        }
-    }*/
+*/
 }

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

@@ -867 +867 @@
     <br>
     <div class="buttons">
-      <g:form>
+      <g:form action="delete">
         <g:if test="${studyList?.size() == 1}">
           <g:set var="studyInstance" value="${studyList[0]}" />