updates to 0.29

vahidhedayati · Mar 2, 2014 · de350fb · de350fb
1 parent b230e38
commit de350fb
Show file tree

Hide file tree

Showing 259 changed files with 112,040 additions and 560 deletions.
diff --git a/grails-app/conf/BuildConfig.groovy b/grails-app/conf/BuildConfig.groovy
@@ -72,7 +72,7 @@ grails.project.dependency.resolution = {
 
 
 		// Uncomment this to use live plugin
-		compile ":ajaxdependancyselection:0.27"
+		//compile ":ajaxdependancyselection:0.27"
     }
 }
-//grails.plugin.location.'ajaxdependancyselection' = "../ajaxdependancyselection"
+grails.plugin.location.'ajaxdependancyselection' = "../ajaxdependancyselection"
diff --git a/grails-app/controllers/ajaxdependancyselectexample/DepartmentsController.groovy b/grails-app/controllers/ajaxdependancyselectexample/DepartmentsController.groovy
@@ -1,102 +1,104 @@
 package ajaxdependancyselectexample
 
-import org.springframework.dao.DataIntegrityViolationException
 
+
+import static org.springframework.http.HttpStatus.*
+import grails.transaction.Transactional
+
+@Transactional(readOnly = true)
 class DepartmentsController {
 
-    static allowedMethods = [save: "POST", update: "POST", delete: "POST"]
+    static allowedMethods = [save: "POST", update: "PUT", delete: "DELETE"]
 
-    def index() {
-        redirect(action: "list", params: params)
+    def index(Integer max) {
+        params.max = Math.min(max ?: 10, 100)
+        respond Departments.list(params), model:[departmentsInstanceCount: Departments.count()]
     }
 
-    def list(Integer max) {
-        params.max = Math.min(max ?: 10, 100)
-        [departmentsInstanceList: Departments.list(params), departmentsInstanceTotal: Departments.count()]
+    def show(Departments departmentsInstance) {
+        respond departmentsInstance
     }
 
     def create() {
-        [departmentsInstance: new Departments(params)]
+        respond new Departments(params)
     }
 
-    def save() {
-        def departmentsInstance = new Departments(params)
-        if (!departmentsInstance.save(flush: true)) {
-            render(view: "create", model: [departmentsInstance: departmentsInstance])
+    @Transactional
+    def save(Departments departmentsInstance) {
+        if (departmentsInstance == null) {
+            notFound()
             return
         }
 
-        flash.message = message(code: 'default.created.message', args: [message(code: 'departments.label', default: 'Departments'), departmentsInstance.id])
-        redirect(action: "show", id: departmentsInstance.id)
-    }
-
-    def show(Long id) {
-        def departmentsInstance = Departments.get(id)
-        if (!departmentsInstance) {
-            flash.message = message(code: 'default.not.found.message', args: [message(code: 'departments.label', default: 'Departments'), id])
-            redirect(action: "list")
+        if (departmentsInstance.hasErrors()) {
+            respond departmentsInstance.errors, view:'create'
             return
         }
 
-        [departmentsInstance: departmentsInstance]
-    }
+        departmentsInstance.save flush:true
 
-    def edit(Long id) {
-        def departmentsInstance = Departments.get(id)
-        if (!departmentsInstance) {
-            flash.message = message(code: 'default.not.found.message', args: [message(code: 'departments.label', default: 'Departments'), id])
-            redirect(action: "list")
-            return
+        request.withFormat {
+            form {
+                flash.message = message(code: 'default.created.message', args: [message(code: 'departmentsInstance.label', default: 'Departments'), departmentsInstance.id])
+                redirect departmentsInstance
+            }
+            '*' { respond departmentsInstance, [status: CREATED] }
         }
+    }
 
-        [departmentsInstance: departmentsInstance]
+    def edit(Departments departmentsInstance) {
+        respond departmentsInstance
     }
 
-    def update(Long id, Long version) {
-        def departmentsInstance = Departments.get(id)
-        if (!departmentsInstance) {
-            flash.message = message(code: 'default.not.found.message', args: [message(code: 'departments.label', default: 'Departments'), id])
-            redirect(action: "list")
+    @Transactional
+    def update(Departments departmentsInstance) {
+        if (departmentsInstance == null) {
+            notFound()
             return
         }
 
-        if (version != null) {
-            if (departmentsInstance.version > version) {
-                departmentsInstance.errors.rejectValue("version", "default.optimistic.locking.failure",
-                          [message(code: 'departments.label', default: 'Departments')] as Object[],
-                          "Another user has updated this Departments while you were editing")
-                render(view: "edit", model: [departmentsInstance: departmentsInstance])
-                return
-            }
+        if (departmentsInstance.hasErrors()) {
+            respond departmentsInstance.errors, view:'edit'
+            return
         }
 
-        departmentsInstance.properties = params
+        departmentsInstance.save flush:true
 
-        if (!departmentsInstance.save(flush: true)) {
-            render(view: "edit", model: [departmentsInstance: departmentsInstance])
-            return
+        request.withFormat {
+            form {
+                flash.message = message(code: 'default.updated.message', args: [message(code: 'Departments.label', default: 'Departments'), departmentsInstance.id])
+                redirect departmentsInstance
+            }
+            '*'{ respond departmentsInstance, [status: OK] }
         }
-
-        flash.message = message(code: 'default.updated.message', args: [message(code: 'departments.label', default: 'Departments'), departmentsInstance.id])
-        redirect(action: "show", id: departmentsInstance.id)
     }
 
-    def delete(Long id) {
-        def departmentsInstance = Departments.get(id)
-        if (!departmentsInstance) {
-            flash.message = message(code: 'default.not.found.message', args: [message(code: 'departments.label', default: 'Departments'), id])
-            redirect(action: "list")
+    @Transactional
+    def delete(Departments departmentsInstance) {
+
+        if (departmentsInstance == null) {
+            notFound()
             return
         }
 
-        try {
-            departmentsInstance.delete(flush: true)
-            flash.message = message(code: 'default.deleted.message', args: [message(code: 'departments.label', default: 'Departments'), id])
-            redirect(action: "list")
+        departmentsInstance.delete flush:true
+
+        request.withFormat {
+            form {
+                flash.message = message(code: 'default.deleted.message', args: [message(code: 'Departments.label', default: 'Departments'), departmentsInstance.id])
+                redirect action:"index", method:"GET"
+            }
+            '*'{ render status: NO_CONTENT }
         }
-        catch (DataIntegrityViolationException e) {
-            flash.message = message(code: 'default.not.deleted.message', args: [message(code: 'departments.label', default: 'Departments'), id])
-            redirect(action: "show", id: id)
+    }
+
+    protected void notFound() {
+        request.withFormat {
+            form {
+                flash.message = message(code: 'default.not.found.message', args: [message(code: 'departmentsInstance.label', default: 'Departments'), params.id])
+                redirect action: "index", method: "GET"
+            }
+            '*'{ render status: NOT_FOUND }
         }
     }
 }
diff --git a/grails-app/controllers/ajaxdependancyselectexample/EmployeeController.groovy b/grails-app/controllers/ajaxdependancyselectexample/EmployeeController.groovy
@@ -1,102 +1,104 @@
 package ajaxdependancyselectexample
 
-import org.springframework.dao.DataIntegrityViolationException
 
+
+import static org.springframework.http.HttpStatus.*
+import grails.transaction.Transactional
+
+@Transactional(readOnly = true)
 class EmployeeController {
 
-    static allowedMethods = [save: "POST", update: "POST", delete: "POST"]
+    static allowedMethods = [save: "POST", update: "PUT", delete: "DELETE"]
 
-    def index() {
-        redirect(action: "list", params: params)
+    def index(Integer max) {
+        params.max = Math.min(max ?: 10, 100)
+        respond Employee.list(params), model:[employeeInstanceCount: Employee.count()]
     }
 
-    def list(Integer max) {
-        params.max = Math.min(max ?: 10, 100)
-        [employeeInstanceList: Employee.list(params), employeeInstanceTotal: Employee.count()]
+    def show(Employee employeeInstance) {
+        respond employeeInstance
     }
 
     def create() {
-        [employeeInstance: new Employee(params)]
+        respond new Employee(params)
     }
 
-    def save() {
-        def employeeInstance = new Employee(params)
-        if (!employeeInstance.save(flush: true)) {
-            render(view: "create", model: [employeeInstance: employeeInstance])
+    @Transactional
+    def save(Employee employeeInstance) {
+        if (employeeInstance == null) {
+            notFound()
             return
         }
 
-        flash.message = message(code: 'default.created.message', args: [message(code: 'employee.label', default: 'Employee'), employeeInstance.id])
-        redirect(action: "show", id: employeeInstance.id)
-    }
-
-    def show(Long id) {
-        def employeeInstance = Employee.get(id)
-        if (!employeeInstance) {
-            flash.message = message(code: 'default.not.found.message', args: [message(code: 'employee.label', default: 'Employee'), id])
-            redirect(action: "list")
+        if (employeeInstance.hasErrors()) {
+            respond employeeInstance.errors, view:'create'
             return
         }
 
-        [employeeInstance: employeeInstance]
-    }
+        employeeInstance.save flush:true
 
-    def edit(Long id) {
-        def employeeInstance = Employee.get(id)
-        if (!employeeInstance) {
-            flash.message = message(code: 'default.not.found.message', args: [message(code: 'employee.label', default: 'Employee'), id])
-            redirect(action: "list")
-            return
+        request.withFormat {
+            form {
+                flash.message = message(code: 'default.created.message', args: [message(code: 'employeeInstance.label', default: 'Employee'), employeeInstance.id])
+                redirect employeeInstance
+            }
+            '*' { respond employeeInstance, [status: CREATED] }
         }
+    }
 
-        [employeeInstance: employeeInstance]
+    def edit(Employee employeeInstance) {
+        respond employeeInstance
     }
 
-    def update(Long id, Long version) {
-        def employeeInstance = Employee.get(id)
-        if (!employeeInstance) {
-            flash.message = message(code: 'default.not.found.message', args: [message(code: 'employee.label', default: 'Employee'), id])
-            redirect(action: "list")
+    @Transactional
+    def update(Employee employeeInstance) {
+        if (employeeInstance == null) {
+            notFound()
             return
         }
 
-        if (version != null) {
-            if (employeeInstance.version > version) {
-                employeeInstance.errors.rejectValue("version", "default.optimistic.locking.failure",
-                          [message(code: 'employee.label', default: 'Employee')] as Object[],
-                          "Another user has updated this Employee while you were editing")
-                render(view: "edit", model: [employeeInstance: employeeInstance])
-                return
-            }
+        if (employeeInstance.hasErrors()) {
+            respond employeeInstance.errors, view:'edit'
+            return
         }
 
-        employeeInstance.properties = params
+        employeeInstance.save flush:true
 
-        if (!employeeInstance.save(flush: true)) {
-            render(view: "edit", model: [employeeInstance: employeeInstance])
-            return
+        request.withFormat {
+            form {
+                flash.message = message(code: 'default.updated.message', args: [message(code: 'Employee.label', default: 'Employee'), employeeInstance.id])
+                redirect employeeInstance
+            }
+            '*'{ respond employeeInstance, [status: OK] }
         }
-
-        flash.message = message(code: 'default.updated.message', args: [message(code: 'employee.label', default: 'Employee'), employeeInstance.id])
-        redirect(action: "show", id: employeeInstance.id)
     }
 
-    def delete(Long id) {
-        def employeeInstance = Employee.get(id)
-        if (!employeeInstance) {
-            flash.message = message(code: 'default.not.found.message', args: [message(code: 'employee.label', default: 'Employee'), id])
-            redirect(action: "list")
+    @Transactional
+    def delete(Employee employeeInstance) {
+
+        if (employeeInstance == null) {
+            notFound()
             return
         }
 
-        try {
-            employeeInstance.delete(flush: true)
-            flash.message = message(code: 'default.deleted.message', args: [message(code: 'employee.label', default: 'Employee'), id])
-            redirect(action: "list")
+        employeeInstance.delete flush:true
+
+        request.withFormat {
+            form {
+                flash.message = message(code: 'default.deleted.message', args: [message(code: 'Employee.label', default: 'Employee'), employeeInstance.id])
+                redirect action:"index", method:"GET"
+            }
+            '*'{ render status: NO_CONTENT }
         }
-        catch (DataIntegrityViolationException e) {
-            flash.message = message(code: 'default.not.deleted.message', args: [message(code: 'employee.label', default: 'Employee'), id])
-            redirect(action: "show", id: id)
+    }
+
+    protected void notFound() {
+        request.withFormat {
+            form {
+                flash.message = message(code: 'default.not.found.message', args: [message(code: 'employeeInstance.label', default: 'Employee'), params.id])
+                redirect action: "index", method: "GET"
+            }
+            '*'{ render status: NOT_FOUND }
         }
     }
 }