Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/NotebookAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/NotebookAction.java,v
diff -u -r1.7.2.4 -r1.7.2.5
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/NotebookAction.java	11 May 2016 07:07:36 -0000	1.7.2.4
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/NotebookAction.java	3 Feb 2017 11:39:46 -0000	1.7.2.5
@@ -54,29 +54,14 @@
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
 /**
- *
  * @author M Seaton
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
  */
 public class NotebookAction extends LamsDispatchAction {
     // ---------------------------------------------------------------------
     // Instance variables
     // ---------------------------------------------------------------------
     private static Logger log = Logger.getLogger(NotebookAction.class);
 
-    private static IAuditService auditService;
-
     private static final String VIEW_ALL = "viewAll";
     private static final String VIEW_SINGLE = "viewSingle";
     private static final String VIEW_JOURNALS = "viewJournals";
@@ -223,7 +208,7 @@
 	notebookService.createNotebookEntry(id, CoreNotebookConstants.SCRATCH_PAD, signature, userID, title, entry);
 
 	boolean skipViewAll = WebUtil.readBooleanParam(request, "skipViewAll", false);
-	return skipViewAll ? null : viewAll(mapping, actionForm, request, response);
+	return skipViewAll ? null : mapping.findForward("viewAllRedirect");
     }
 
     /**
@@ -259,22 +244,8 @@
 
 	notebookService.updateEntry(entryObj);
 
-	return viewAll(mapping, actionForm, request, response);
+	return mapping.findForward("viewAllRedirect");
 
     }
 
-    /**
-     * Get AuditService bean.
-     *
-     * @return
-     */
-    private IAuditService getAuditService() {
-	if (NotebookAction.auditService == null) {
-	    WebApplicationContext ctx = WebApplicationContextUtils
-		    .getRequiredWebApplicationContext(getServlet().getServletContext());
-	    NotebookAction.auditService = (IAuditService) ctx.getBean("auditService");
-	}
-	return NotebookAction.auditService;
-    }
-
 }
\ No newline at end of file
Index: lams_learning/web/WEB-INF/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/Attic/struts-config.xml,v
diff -u -r1.1.2.3 -r1.1.2.4
--- lams_learning/web/WEB-INF/struts-config.xml	6 Jun 2016 08:44:29 -0000	1.1.2.3
+++ lams_learning/web/WEB-INF/struts-config.xml	3 Feb 2017 11:39:46 -0000	1.1.2.4
@@ -116,6 +116,11 @@
         redirect="false"
       />
       <forward
+        name="viewAllRedirect"
+        path="/notebook.do?method=viewAll"
+        redirect="true"
+      />
+      <forward
         name="viewSingle"
         path=".notebookViewSingle"
         redirect="false"