Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/NotebookAction.java
===================================================================
diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -r214e4972a0db93d9932b226f96b424849c8aacea
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/NotebookAction.java	(.../NotebookAction.java)	(revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/NotebookAction.java	(.../NotebookAction.java)	(revision 214e4972a0db93d9932b226f96b424849c8aacea)
@@ -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
===================================================================
diff -u -rb4460e9343e9676b6fc81f5f3c27b2800d865b20 -r214e4972a0db93d9932b226f96b424849c8aacea
--- lams_learning/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision b4460e9343e9676b6fc81f5f3c27b2800d865b20)
+++ lams_learning/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 214e4972a0db93d9932b226f96b424849c8aacea)
@@ -116,6 +116,11 @@
         redirect="false"
       />
       <forward
+        name="viewAllRedirect"
+        path="/notebook.do?method=viewAll"
+        redirect="true"
+      />
+      <forward
         name="viewSingle"
         path=".notebookViewSingle"
         redirect="false"