Index: /trunk/application.properties =================================================================== --- /trunk/application.properties (revision 105) +++ /trunk/application.properties (revision 106) @@ -1,4 +1,4 @@ #utf-8 -#Sun Apr 05 15:45:59 EST 2009 +#Sun Apr 05 16:03:34 EST 2009 plugins.help-balloons=1.2 app.version=0.1 Index: /trunk/grails-app/controllers/AppCoreController.groovy =================================================================== --- /trunk/grails-app/controllers/AppCoreController.groovy (revision 105) +++ /trunk/grails-app/controllers/AppCoreController.groovy (revision 106) @@ -56,5 +56,5 @@ @Secured(['ROLE_AppAdmin']) - def admin = { + def appAdmin = { } Index: /trunk/grails-app/controllers/TaskDetailedController.groovy =================================================================== --- /trunk/grails-app/controllers/TaskDetailedController.groovy (revision 105) +++ /trunk/grails-app/controllers/TaskDetailedController.groovy (revision 106) @@ -10,5 +10,6 @@ def list = { params.max = Math.min( params.max ? params.max.toInteger() : 10, 100) - [ taskInstanceList: Task.list( params ), taskInstanceTotal: Task.count() ] + def taskInstanceList = Task.findAllByIsActive( true ) + return [ taskInstanceList: taskInstanceList, taskInstanceTotal: taskInstanceList.count() ] } @@ -27,6 +28,6 @@ if(taskInstance) { try { - taskInstance.delete() - flash.message = "Task ${params.id} deleted" + taskInstance.isActive = false + flash.message = "Task ${params.id} has been set to inactive." redirect(action:list) } Index: /trunk/grails-app/domain/Task.groovy =================================================================== --- /trunk/grails-app/domain/Task.groovy (revision 105) +++ /trunk/grails-app/domain/Task.groovy (revision 106) @@ -28,5 +28,5 @@ taskStatus() parentTask(blank: true, nullable:true) - comment(maxSize:255) + comment() } Index: /trunk/grails-app/i18n/messages.properties =================================================================== --- /trunk/grails-app/i18n/messages.properties (revision 105) +++ /trunk/grails-app/i18n/messages.properties (revision 106) @@ -5,4 +5,17 @@ entry.duration=Duration entry.duration.help=The time (hh:mm) booked against this entry for date done. + +task.assignedPersons=Assigned Persons +task.assignedPersons.help=The persons assigned to work on this task during planning along with estimated time. +task.description=Task Description +task.description.help=Short basic description of the task. +task.comment=Task Comment +task.comment.help=Long text for additional info, only shown in detail views. +task.targetStartDate=Target Start Date +task.targetStartDate.help=The date we would like the task to start, set during scheduling. +task.targetCompletionDate=Target Completion Date +task.targetCompletionDate.help=The date we would like the task to be completed by, set during scheduling. +task.leadPerson=Lead Person +task.leadPerson.help=The primay contact person. default.doesnt.match.message=Property [{0}] of class [{1}] with value [{2}] does not match the required pattern [{3}] Index: /trunk/grails-app/views/_adminmenubar.gsp =================================================================== --- /trunk/grails-app/views/_adminmenubar.gsp (revision 105) +++ /trunk/grails-app/views/_adminmenubar.gsp (revision 106) @@ -9,6 +9,6 @@ - - Admin + + AppAdmin Index: unk/grails-app/views/appCore/admin.gsp =================================================================== --- /trunk/grails-app/views/appCore/admin.gsp (revision 105) +++ (revision ) @@ -1,29 +1,0 @@ - - - - - Admin - - -
- Home -
-
-

Application Admin

-
- 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.
-
-
-
-
    - -
  • ${c.fullName}
    • -     -
-
-
- - Index: /trunk/grails-app/views/appCore/appAdmin.gsp =================================================================== --- /trunk/grails-app/views/appCore/appAdmin.gsp (revision 106) +++ /trunk/grails-app/views/appCore/appAdmin.gsp (revision 106) @@ -0,0 +1,29 @@ + + + + + Admin + + +
+ Home +
+
+

Application Admin

+
+ 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.
+
+
+
+
    + +
  • ${c.fullName}
    • +     +
+
+
+ + Index: /trunk/grails-app/views/layouts/main.gsp =================================================================== --- /trunk/grails-app/views/layouts/main.gsp (revision 105) +++ /trunk/grails-app/views/layouts/main.gsp (revision 106) @@ -18,10 +18,4 @@ Spinner -