show protocols in a protocol group

Author: dshao

pegr/grails-app/controllers/pegr/ItemInterceptor.groovy

@@ -14,7 +14,9 @@ class ItemInterceptor {
                            'upload',
                            'deleteImage',
                            'delete',
-                           'updateStatusAjax']) {
+                           'updateStatusAjax',
+                           'updateActiveAjax'
+                          ]) {
             def itemId = params.long('itemId')
             def item = Item.get(itemId)
             def currUser = springSecurityService.currentUser

pegr/grails-app/views/protocol/showGroup.gsp

@@ -25,7 +25,7 @@
 					<h4>Protocols</h4>
 					<ol>
 						<g:each in="${protocolGroup.protocols}" var="p">
-						<li><span class="property-value" aria-labelledby="protocols-label"><g:link controller="protocolAdmin" action="show" id="${p.id}">${p?.encodeAsHTML()}</g:link></span></li>
+						<li><span class="property-value" aria-labelledby="protocols-label"><g:link controller="protocol" action="show" id="${p.id}">${p?.encodeAsHTML()}</g:link></span></li>
 						</g:each>
 					</ol>
 			</g:if>

pegr/grails-app/views/protocolGroupAdmin/show.gsp

@@ -27,7 +27,7 @@
 					<h4>Protocols</h4>
 					<ol>
 						<g:each in="${protocolGroupInstance.protocols}" var="p">
-						<li><span class="property-value" aria-labelledby="protocols-label"><g:link controller="protocolAdmin" action="show" id="${p.id}">${p?.encodeAsHTML()}</g:link></span></li>
+						<li><span class="property-value" aria-labelledby="protocols-label"><g:link controller="protocol" action="show" id="${p.id}">${p?.encodeAsHTML()}</g:link></span></li>
 						</g:each>
 					</ol>
 			</g:if>

pegr/grails-app/views/user/forgetPassword.gsp

@@ -8,7 +8,7 @@
                 <div class="alert alert-danger">${flash.message}</div>
             </g:if>
             <g:form controller="user" action="sendResetPasswordEmail">
-                <p>Please enter your username and we will email you the link to reset your password. </p>
+                <p>Please enter your email and we will email you the link to reset your password. </p>
                 <label>Email</label>
                 <input name="email">
                 <g:submitButton name="submit" value="Submit" class="btn btn-primary"></g:submitButton>