Changeset 122 for trunk/grails-app/controllers/EntryTypeController.groovy

Timestamp:

May 1, 2009, 3:27:41 PM (16 years ago)

Author:

gav

Message:

Run generate-all on all controllers and views except Person and Authority.
Extensive work on Asset domain and application now compiles and runs well.
Update BootStrap? to suite.

File:

• trunk/grails-app/controllers/EntryTypeController.groovy (modified) (3 diffs)

trunk/grails-app/controllers/EntryTypeController.groovy

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