Index: /trunk/src/grails-app/conf/BootStrap.groovy =================================================================== --- /trunk/src/grails-app/conf/BootStrap.groovy (revision 90) +++ /trunk/src/grails-app/conf/BootStrap.groovy (revision 91) @@ -67,5 +67,9 @@ BootStrapSaveAndTest(authInstance) - authInstance = new Authority(description:"Application User, all application users need this base role.", + authInstance = new Authority(description:"Business manager, grants full management access.", + authority:"ROLE_Manager") + BootStrapSaveAndTest(authInstance) + + authInstance = new Authority(description:"Application User, all application users need this base role to allow login.", authority:"ROLE_AppUser") BootStrapSaveAndTest(authInstance) @@ -85,15 +89,16 @@ personInstance.addToAuthorities(Authority.get(1)) personInstance.addToAuthorities(Authority.get(2)) + personInstance.addToAuthorities(Authority.get(3)) personInstance.addToPersonGroups(PersonGroup.findByName("gnuMims")) - personInstance = new Person(loginName:"admin2", - firstName:"Admin2", - lastName:"Powers2", - pass:passClearText, - password:passwordEncoded, - email:"admin2@example.com") - BootStrapSaveAndTest(personInstance) - personInstance.addToAuthorities(Authority.get(1)) + personInstance = new Person(loginName:"manager", + firstName:"Meca", + lastName:"Manager", + pass:passClearText, + password:passwordEncoded, + email:"manager@example.com") + BootStrapSaveAndTest(personInstance) personInstance.addToAuthorities(Authority.get(2)) + personInstance.addToAuthorities(Authority.get(3)) personInstance.addToPersonGroups(PersonGroup.findByName("gnuMims")) @@ -105,5 +110,5 @@ email:"user@example.com") BootStrapSaveAndTest(personInstance) - personInstance.addToAuthorities(Authority.get(2)) + personInstance.addToAuthorities(Authority.get(3)) personInstance.addToPersonGroups(PersonGroup.findByName("Electrical")) @@ -115,5 +120,5 @@ email:"user@example.com") BootStrapSaveAndTest(personInstance) - personInstance.addToAuthorities(Authority.get(2)) + personInstance.addToAuthorities(Authority.get(3)) personInstance.addToPersonGroups(PersonGroup.findByName("Electrical")) @@ -125,5 +130,5 @@ email:"user@example.com") BootStrapSaveAndTest(personInstance) - personInstance.addToAuthorities(Authority.get(2)) + personInstance.addToAuthorities(Authority.get(3)) personInstance.addToPersonGroups(PersonGroup.findByName("Mechanical")) @@ -135,5 +140,5 @@ email:"user@example.com") BootStrapSaveAndTest(personInstance) - personInstance.addToAuthorities(Authority.get(2)) + personInstance.addToAuthorities(Authority.get(3)) personInstance.addToPersonGroups(PersonGroup.findByName("Production")) Index: /trunk/src/grails-app/controllers/AppCoreController.groovy =================================================================== --- /trunk/src/grails-app/controllers/AppCoreController.groovy (revision 90) +++ /trunk/src/grails-app/controllers/AppCoreController.groovy (revision 91) @@ -42,4 +42,7 @@ } + @Secured(['ROLE_Manager']) + def manager = { + } @Secured(['ROLE_AppAdmin']) Index: /trunk/src/grails-app/controllers/EntryDetailedController.groovy =================================================================== --- /trunk/src/grails-app/controllers/EntryDetailedController.groovy (revision 91) +++ /trunk/src/grails-app/controllers/EntryDetailedController.groovy (revision 91) @@ -0,0 +1,88 @@ +import org.codehaus.groovy.grails.plugins.springsecurity.Secured + +class EntryDetailedController extends BaseController { + + def authenticateService + + def index = { redirect(action:list,params:params) } + + // the delete, save and update actions only accept POST requests + static allowedMethods = [delete:'POST', save:'POST', update:'POST'] + + def list = { + if(!params.max) params.max = 10 + [ entryInstanceList: Entry.list( params ) ] + } + + def show = { + def entryInstance = Entry.get( params.id ) + + if(!entryInstance) { + flash.message = "Entry not found with id ${params.id}" + redirect(action:list) + } + else { return [ entryInstance : entryInstance ] } + } + + def delete = { + def entryInstance = Entry.get( params.id ) + if(entryInstance) { + entryInstance.delete() + flash.message = "Entry ${params.id} deleted" + redirect(action:list) + } + else { + flash.message = "Entry not found with id ${params.id}" + redirect(action:list) + } + } + + def edit = { + def entryInstance = Entry.get( params.id ) + + if(!entryInstance) { + flash.message = "Entry not found with id ${params.id}" + redirect(action:list) + } + else { + return [ entryInstance : entryInstance ] + } + } + + def update = { + def entryInstance = Entry.get( params.id ) + if(entryInstance) { + entryInstance.properties = params + if(!entryInstance.hasErrors() && entryInstance.save()) { + flash.message = "Entry ${params.id} updated" + redirect(action:show,id:entryInstance.id) + } + else { + render(view:'edit',model:[entryInstance:entryInstance]) + } + } + else { + flash.message = "Entry not found with id ${params.id}" + redirect(action:edit,id:params.id) + } + } + + def create = { + def entryInstance = new Entry() + entryInstance.properties = params + return ['entryInstance':entryInstance] + } + + def save = { + def entryInstance = new Entry(params) + + entryInstance.enteredBy = Person.get(authenticateService.userDomain().id) + if(!entryInstance.hasErrors() && entryInstance.save()) { + flash.message = "Entry ${entryInstance.id} created" + redirect(controller:"taskDetailed", action:"show", id: params.task.id) + } + else { + render(view:'create',model:[entryInstance:entryInstance]) + } + } +} Index: /trunk/src/grails-app/controllers/PersonController.groovy =================================================================== --- /trunk/src/grails-app/controllers/PersonController.groovy (revision 90) +++ /trunk/src/grails-app/controllers/PersonController.groovy (revision 91) @@ -1,5 +1,5 @@ import org.codehaus.groovy.grails.plugins.springsecurity.Secured -@Secured(['ROLE_AppAdmin']) +@Secured(['ROLE_AppAdmin', 'ROLE_Manager']) class PersonController { @@ -53,6 +53,14 @@ //first, delete this person from Persons_Authorities table. Authority.findAll().each { it.removeFromPersons(person) } - person.delete() - flash.message = "Person $params.id deleted." + +// try { + person.delete(flush:true) + flash.message = "Person $params.id deleted." +// } +// catch(Exception e) { +// flash.message = "Could not delete '$person.loginName' due to database constraints, but all authorities have been removed." +// redirect action: edit, id: person.id +// } + } } Index: /trunk/src/grails-app/domain/Task.groovy =================================================================== --- /trunk/src/grails-app/domain/Task.groovy (revision 90) +++ /trunk/src/grails-app/domain/Task.groovy (revision 91) @@ -23,5 +23,5 @@ static constraints = { targetStartDate() - description(blank:false,maxSize:50) + description(blank:false,maxSize:75) leadPerson() taskPriority() Index: /trunk/src/grails-app/views/_adminmenubar.gsp =================================================================== --- /trunk/src/grails-app/views/_adminmenubar.gsp (revision 90) +++ /trunk/src/grails-app/views/_adminmenubar.gsp (revision 91) @@ -1,3 +1,10 @@ + + + + Manager + + + Index: /trunk/src/grails-app/views/appCore/admin.gsp =================================================================== --- /trunk/src/grails-app/views/appCore/admin.gsp (revision 90) +++ /trunk/src/grails-app/views/appCore/admin.gsp (revision 91) @@ -8,11 +8,12 @@
Home - New Person
-

Welcome to Admin

+

Application Admin

- "Warning these pages are for use by the application admin only and not for daily use."
- "They allow direct administration of the back-end data, cascade deletion and updates may occur." + Warning!
+ The pages bellow this line are for use by the application admin only and NOT for daily use.
+ They allow direct administration of the back-end data, cascade deletion and updates may occur.
+ The manager authorisation and pages should be used for normal daily use.

Index: /trunk/src/grails-app/views/appCore/manager.gsp =================================================================== --- /trunk/src/grails-app/views/appCore/manager.gsp (revision 91) +++ /trunk/src/grails-app/views/appCore/manager.gsp (revision 91) @@ -0,0 +1,18 @@ + + + + + Admin + + +
+ Home + New Person + Person List +
+
+

Welcome to Manager

+ +
+ + Index: /trunk/src/grails-app/views/taskDetailed/create.gsp =================================================================== --- /trunk/src/grails-app/views/taskDetailed/create.gsp (revision 90) +++ /trunk/src/grails-app/views/taskDetailed/create.gsp (revision 91) @@ -32,5 +32,5 @@ - + Index: /trunk/src/grails-app/views/taskDetailed/edit.gsp =================================================================== --- /trunk/src/grails-app/views/taskDetailed/edit.gsp (revision 90) +++ /trunk/src/grails-app/views/taskDetailed/edit.gsp (revision 91) @@ -41,5 +41,5 @@ - + @@ -98,20 +98,4 @@ - - - - - - - -
    - -
  • ${a?.encodeAsHTML()}
    • -     -
-Add Person - - - Index: /trunk/src/grails-app/views/taskDetailed/show.gsp =================================================================== --- /trunk/src/grails-app/views/taskDetailed/show.gsp (revision 90) +++ /trunk/src/grails-app/views/taskDetailed/show.gsp (revision 91) @@ -59,5 +59,5 @@ Lead Person: - ${taskInstance?.leadPerson?.encodeAsHTML()} + ${taskInstance?.leadPerson?.encodeAsHTML()} @@ -66,5 +66,5 @@ Task Priority: - ${taskInstance?.taskPriority?.encodeAsHTML()} + ${taskInstance?.taskPriority?.encodeAsHTML()} @@ -73,5 +73,5 @@ Task Status: - ${taskInstance?.taskStatus?.encodeAsHTML()} + ${taskInstance?.taskStatus?.encodeAsHTML()} @@ -79,40 +79,33 @@ Assigned Persons: - - ${fieldValue(bean:taskInstance, field:'assignedPersons')} - - - - - Is Active: - - ${fieldValue(bean:taskInstance, field:'isActive')} - - - - - Is Approved: - - ${fieldValue(bean:taskInstance, field:'isApproved')} - - - - - Is Scheduled: - - ${fieldValue(bean:taskInstance, field:'isScheduled')} - - - - - Modifications:
    - -
  • ${m?.encodeAsHTML()}
    • + +
  • ${s?.firstName} ${s?.lastName}
    •
+ + + + + Is Active: + + ${fieldValue(bean:taskInstance, field:'isActive')} + + + + + Is Approved: + + ${fieldValue(bean:taskInstance, field:'isApproved')} + + + + + Is Scheduled: + + ${fieldValue(bean:taskInstance, field:'isScheduled')} @@ -141,5 +134,5 @@ Task Group: - ${taskInstance?.taskGroup?.encodeAsHTML()} + ${taskInstance?.taskGroup?.encodeAsHTML()} @@ -148,5 +141,5 @@ Task Type: - ${taskInstance?.taskType?.encodeAsHTML()} + ${taskInstance?.taskType?.encodeAsHTML()} @@ -168,9 +161,12 @@ - + Comment + Date Done + Entered By + @@ -198,9 +194,12 @@ - - - - - + Comment + Date Done + Entered By + @@ -223,4 +222,12 @@
+
+ +
+ + Add Entry + +
+