Changeset 98 for trunk/src/grails-app/controllers

Timestamp:

Apr 4, 2009, 6:41:25 PM (16 years ago)

Author:

gav

Message:

Installed help-balloons plugin.
Adjust security config to allow javascript and help-balloons folders.
Add "Repeat password" to change password.
Detailed Entry views, including only allow user to edit their own entries.
Adjust Entry constraints.
Add comments to layouts/main.gsp.
Work on TaskDetailed? view to show entry durations and allow editing.
Entry duration formatting to CSS and increased base font size to 14px.

Location:

trunk/src/grails-app/controllers

Files:

• AppCoreController.groovy (modified) (1 diff)
• EntryDetailedController.groovy (modified) (3 diffs)

trunk/src/grails-app/controllers/AppCoreController.groovy

@@ -27 +27 @@
         if (request.method == 'POST') {
             def personInstance = Person.get(authenticateService.userDomain().id)
-    
-            personInstance.pass = params.pass
-            personInstance.password = authenticateService.encodePassword(personInstance.pass)
 
-            if (!personInstance.hasErrors() && personInstance.save()) {
-                //userCache.removeUserFromCache(personInstance.loginName)
-                flash.message = "Password changed successfully."
-                redirect(action:options)
+            if(params.repeatPass == params.pass) {
+                personInstance.pass = params.pass
+                personInstance.password = authenticateService.encodePassword(personInstance.pass)
+
+                if (!personInstance.hasErrors() && personInstance.save()) {
+                    //userCache.removeUserFromCache(personInstance.loginName)
+                    flash.message = "Password changed successfully."
+                    redirect(action:options)
+                }
+                else {
+                    render(view:'changePassword',model:[personInstance:personInstance])
+                }
             }
             else {
+                flash.message = "Passwords must match."
+//                 personInstance.addToErrors("Passwords must match.")
                 render(view:'changePassword',model:[personInstance:personInstance])
-            }                          
+            }
+                
         }  
     }

trunk/src/grails-app/controllers/EntryDetailedController.groovy

@@ -28 +28 @@
         def entryInstance = Entry.get( params.id )
         if(entryInstance) {
-            entryInstance.delete()
-            flash.message = "Entry ${params.id} deleted"
-            redirect(action:list)
+            if(entryInstance.enteredBy.loginName == authenticateService.userDomain().loginName) {
+                entryInstance.delete()
+                flash.message = "Entry ${params.id} deleted"
+                redirect(action:list)
+            }
+            else {
+                flash.message = "You may only delete your own entries."
+                redirect(action:show,id:entryInstance.id)
+            }
+
         }
         else {
@@ -40 +47 @@
     def edit = {
         def entryInstance = Entry.get( params.id )
-
         if(!entryInstance) {
-            flash.message = "Entry not found with id ${params.id}"
-            redirect(action:list)
+                flash.message = "Entry not found with id ${params.id}"
+                redirect(action:list)
         }
         else {
-            return [ entryInstance : entryInstance ]
+
+            if(entryInstance.enteredBy.loginName == authenticateService.userDomain().loginName) {
+                return [ entryInstance : entryInstance ]
+            }
+            else {
+                flash.message = "You may only edit your own entries."
+                redirect(action:show,id:entryInstance.id)
+            }
+
         }
     }
@@ -69 +83 @@
 
     def create = {
-        def entryInstance = new Entry()
-        entryInstance.properties = params
-        return ['entryInstance':entryInstance]
+        try {
+            def taskInstance = Task.get(params.taskInstance.id)
+            def entryInstance = new Entry()
+            entryInstance.task = taskInstance
+            return ['entryInstance':entryInstance]
+        }
+        catch(Exception e) {
+            flash.message = "Please select a task, then 'Add Entry'"
+            redirect(controller:"taskDetailed", action:"list")
+        }
     }