Index: branches/features/grailsUpgrade/grails-app/views/taskDetailed/createUnscheduled.gsp
===================================================================
--- branches/features/grailsUpgrade/grails-app/views/taskDetailed/createUnscheduled.gsp	(revision 881)
+++ branches/features/grailsUpgrade/grails-app/views/taskDetailed/createUnscheduled.gsp	(revision 884)
@@ -129,35 +129,47 @@
                                     ${taskInstance.taskType.encodeAsHTML()}
                                 </td>
-                            </tr> 
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="safetyRequirement">Safety Requirement:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'safetyRequirement','errors')}">
-                                    <g:checkBox name="safetyRequirement" value="${taskInstance?.safetyRequirement}" ></g:checkBox>
-                                    <g:helpBalloon code="task.safetyRequirement" />
-                                </td>
-                            </tr> 
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="regulatoryRequirement">Regulatory Requirement:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'regulatoryRequirement','errors')}">
-                                    <g:checkBox name="regulatoryRequirement" value="${taskInstance?.regulatoryRequirement}" ></g:checkBox>
-                                    <g:helpBalloon code="task.regulatoryRequirement" />
-                                </td>
-                            </tr> 
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="mandatoryRequirement">Mandatory Requirement:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'mandatoryRequirement','errors')}">
-                                    <g:checkBox name="mandatoryRequirement" value="${taskInstance?.mandatoryRequirement}" ></g:checkBox>
-                                    <g:helpBalloon code="task.mandatoryRequirement" />
-                                </td>
-                            </tr> 
+                            </tr>
+
+                            <g:ifAnyGranted role="ROLE_AppAdmin,ROLE_Manager,ROLE_TaskManager">
+                                <tr class="prop">
+                                    <td valign="top" class="name">
+                                        <label for="safetyRequirement">Safety Requirement:</label>
+                                    </td>
+                                    <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'safetyRequirement','errors')}">
+                                        <g:checkBox name="safetyRequirement" value="${taskInstance?.safetyRequirement}" ></g:checkBox>
+                                        <g:helpBalloon code="task.safetyRequirement" />
+                                    </td>
+                                </tr>
+
+                                <tr class="prop">
+                                    <td valign="top" class="name">
+                                        <label for="regulatoryRequirement">Regulatory Requirement:</label>
+                                    </td>
+                                    <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'regulatoryRequirement','errors')}">
+                                        <g:checkBox name="regulatoryRequirement" value="${taskInstance?.regulatoryRequirement}" ></g:checkBox>
+                                        <g:helpBalloon code="task.regulatoryRequirement" />
+                                    </td>
+                                </tr>
+
+                                <tr class="prop">
+                                    <td valign="top" class="name">
+                                        <label for="mandatoryRequirement">Mandatory Requirement:</label>
+                                    </td>
+                                    <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'mandatoryRequirement','errors')}">
+                                        <g:checkBox name="mandatoryRequirement" value="${taskInstance?.mandatoryRequirement}" ></g:checkBox>
+                                        <g:helpBalloon code="task.mandatoryRequirement" />
+                                    </td>
+                                </tr>
+
+                                <tr class="prop">
+                                    <td valign="top" class="name">
+                                        <label for="positiveFault">Positive Fault:</label>
+                                    </td>
+                                    <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'positiveFault','errors')}">
+                                        <g:checkBox name="positiveFault" value="${taskInstance?.positiveFault}" ></g:checkBox>
+                                        <g:helpBalloon code="task.positiveFault" />
+                                    </td>
+                                </tr>
+                            </g:ifAnyGranted>
                         
                         </tbody>
Index: branches/features/grailsUpgrade/grails-app/views/taskDetailed/edit.gsp
===================================================================
--- branches/features/grailsUpgrade/grails-app/views/taskDetailed/edit.gsp	(revision 881)
+++ branches/features/grailsUpgrade/grails-app/views/taskDetailed/edit.gsp	(revision 884)
@@ -161,44 +161,46 @@
                                 </td>
                             </tr>
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="safetyRequirement">Safety Requirement:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'safetyRequirement','errors')}">
-                                    <g:checkBox name="safetyRequirement" value="${taskInstance?.safetyRequirement}" ></g:checkBox>
-                                    <g:helpBalloon code="task.safetyRequirement" />
-                                </td>
-                            </tr> 
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="regulatoryRequirement">Regulatory Requirement:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'regulatoryRequirement','errors')}">
-                                    <g:checkBox name="regulatoryRequirement" value="${taskInstance?.regulatoryRequirement}" ></g:checkBox>
-                                    <g:helpBalloon code="task.regulatoryRequirement" />
-                                </td>
-                            </tr> 
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="mandatoryRequirement">Mandatory Requirement:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'mandatoryRequirement','errors')}">
-                                    <g:checkBox name="mandatoryRequirement" value="${taskInstance?.mandatoryRequirement}" ></g:checkBox>
-                                    <g:helpBalloon code="task.mandatoryRequirement" />
-                                </td>
-                            </tr> 
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="positiveFault">Positive Fault:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'positiveFault','errors')}">
-                                    <g:checkBox name="positiveFault" value="${taskInstance?.positiveFault}" ></g:checkBox>
-                                    <g:helpBalloon code="task.positiveFault" />
-                                </td>
-                            </tr> 
+
+                            <g:ifAnyGranted role="ROLE_AppAdmin,ROLE_Manager,ROLE_TaskManager">
+                                <tr class="prop">
+                                    <td valign="top" class="name">
+                                        <label for="safetyRequirement">Safety Requirement:</label>
+                                    </td>
+                                    <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'safetyRequirement','errors')}">
+                                        <g:checkBox name="safetyRequirement" value="${taskInstance?.safetyRequirement}" ></g:checkBox>
+                                        <g:helpBalloon code="task.safetyRequirement" />
+                                    </td>
+                                </tr>
+
+                                <tr class="prop">
+                                    <td valign="top" class="name">
+                                        <label for="regulatoryRequirement">Regulatory Requirement:</label>
+                                    </td>
+                                    <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'regulatoryRequirement','errors')}">
+                                        <g:checkBox name="regulatoryRequirement" value="${taskInstance?.regulatoryRequirement}" ></g:checkBox>
+                                        <g:helpBalloon code="task.regulatoryRequirement" />
+                                    </td>
+                                </tr>
+
+                                <tr class="prop">
+                                    <td valign="top" class="name">
+                                        <label for="mandatoryRequirement">Mandatory Requirement:</label>
+                                    </td>
+                                    <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'mandatoryRequirement','errors')}">
+                                        <g:checkBox name="mandatoryRequirement" value="${taskInstance?.mandatoryRequirement}" ></g:checkBox>
+                                        <g:helpBalloon code="task.mandatoryRequirement" />
+                                    </td>
+                                </tr>
+
+                                <tr class="prop">
+                                    <td valign="top" class="name">
+                                        <label for="positiveFault">Positive Fault:</label>
+                                    </td>
+                                    <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'positiveFault','errors')}">
+                                        <g:checkBox name="positiveFault" value="${taskInstance?.positiveFault}" ></g:checkBox>
+                                        <g:helpBalloon code="task.positiveFault" />
+                                    </td>
+                                </tr>
+                            </g:ifAnyGranted>
 
                             <g:if test="${taskInstance.assignedGroups}">