Changeset 4421

Timestamp:

Feb 25, 2013, 2:48:31 PM (10 years ago)

Author:

olle

Message:

Refs #797. Regular update of the job table via Ajax updated to prevent the Ajax action from being used as "last action", in case no forward action is set:

1. JavaScript www/static/js/script.js in client/servlet/ updated in function updateJobTableColumns() to add a parameter requestType to the Ajax request, and set its value to "Ajax".
2. Class/file se/lu/thep/waf/Event.java in api/waf updated with new public method AbstractAction getLastNonAjaxAction(), that returns the last action in the queue, that is not marked as being an Ajax request.
3. Class/file action/ActionFactory.java in client/servlet/ updated in public method void setLastEvent(Event event) to call new Event public method AbstractAction getLastNonAjaxAction() instead of AbstractAction getLastAction(), when obtaining an action id to set as session attribute "previous.action.id" for the event.
4. Class/file action/job/ListJobsAjax.java in client/servlet/ updated to take no special action depending on the value of the cmd parameter, and make a log entry snd return if the value of the requestType parameter differs from "Ajax". The changes to this class are strictly not necessary for the new functionality to work, but the log entries are used to check if the action is used, when not intended.

Location:

trunk

Files:

• api/waf/src/se/lu/thep/waf/Event.java (modified) (1 diff)
• client/servlet/src/org/proteios/action/ActionFactory.java (modified) (1 diff)
• client/servlet/src/org/proteios/action/job/ListJobsAjax.java (modified) (1 diff)
• client/servlet/www/static/js/script.js (modified) (1 diff)

trunk/api/waf/src/se/lu/thep/waf/Event.java

@@ -259 +259 @@
 
   /**
+   * @return the last action in the queue, that is not marked as being an Ajax request 
+   */
+  public AbstractAction getLastNonAjaxAction()
+  {
+    AbstractAction lastAction = null;
+    if (actionChain.size() > 0)
+    {
+      // Return last AbstractAction that is not an Ajax type action
+      for (int i = 0; i < actionChain.size(); i++)
+      {
+        AbstractAction action = actionChain.get(actionChain.size() - 1 - i);
+        if (action != null)
+        {
+          String requestType = "";
+          HttpServletRequest req = action.getRequest();
+          if (req != null)
+          {
+            requestType = req.getParameter("requestType");
+          }
+          if (requestType == null || !requestType.equals("Ajax"))
+          {
+            // Set action as last action
+            lastAction = action;
+            break;
+          }
+        }
+      }
+    }
+    return lastAction;
+  }
+
+
+  /**
    * Runs the specified action and returning the next action to run
    * 

trunk/client/servlet/src/org/proteios/action/ActionFactory.java

@@ -774 +774 @@
     public void setLastEvent(Event event)
     {
-        event.getRequest().getSession().setAttribute("previous.action.id",
-        event.getLastAction().getId());
+      AbstractAction action = event.getLastNonAjaxAction();
+      if (action != null)
+      {
+            event.getRequest().getSession().setAttribute("previous.action.id",
+                action.getId());
+      }
     }
         

trunk/client/servlet/src/org/proteios/action/job/ListJobsAjax.java

@@ -79 +79 @@
   {
           String ID = req.getParameter("ID");
+          String requestType = req.getParameter("requestType");
           String cmd = req.getParameter("cmd");
           String jobIdListStr = req.getParameter("jobIdList");
           log.debug("doGet(): ID = \"" + ID + "\"");
+          log.debug("doGet(): requestType = \"" + requestType + "\"");
           log.debug("doGet(): cmd = \"" + cmd + "\"");
           log.debug("doGet(): jobIdList = \"" + jobIdListStr + "\"");
-          if (cmd == null || !cmd.equals("updateJobTable"))
+          if (requestType == null || !requestType.equals("Ajax"))
           {
-            // Request not intended for this servlet, forward to ListJobs
-            setForwardTo(ListJobs.class);
+            // Request not intended for this servlet
+            log.debug("doGet(): requestType = \"" + requestType + "\" - Immediate return");
             return;
           }

trunk/client/servlet/www/static/js/script.js

@@ -438 +438 @@
 function updateJobTableColumns()
 {
-  // Set cmd so Ajax application can verify that the request was not intended for other servlet
+  // Set cmd
   var cmd = 'updateJobTable';
+  // Set requestType to "Ajax" to prevent action from being returned as "last action"
+  var requestType = 'Ajax';
   // Get job id values in comma-separated list
   var jobIdList = getJobIdList();
-  var url = 'app?action=org.proteios.action.job.ListJobsAjax&cmd=' + cmd + '&jobIdList=' + jobIdList;
+  // Create url for Ajax XMLHttpRequest
+  var url = 'app?action=org.proteios.action.job.ListJobsAjax&requestType=' + requestType + '&cmd=' + cmd + '&jobIdList=' + jobIdList;
   var request = new XMLHttpRequest();
   request.open("GET", url, false);