Changeset 4419

Timestamp:

Feb 21, 2013, 3:29:15 PM (10 years ago)

Author:

olle

Message:

Refs #797. Regular update of the job table via Ajax updated to not interfere with actions on the "Jobs" web page, that do not set a forward action, but rely on being returned to action ListJobs as the last action:

1. JavaScript? www/static/js/script.js in client/servlet/ updated in function updateJobTableColumns() to add a parameter cmd to the Ajax request, and set its value to "updateJobTable".
2. Class/file action/job/ListJobsAjax.java in client/servlet/ updated to identify a proper Ajax request by requiring that parameter cmd has value "updateJobTable", and otherwise forward the request to action ListJobs.class.

Location:

trunk/client/servlet

Files:

• src/org/proteios/action/job/ListJobsAjax.java (modified) (1 diff)
• www/static/js/script.js (modified) (1 diff)

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

@@ -105 +105 @@
           log.debug("doGet(): cmd = \"" + cmd + "\"");
           log.debug("doGet(): jobIdList = \"" + jobIdListStr + "\"");
+          if (cmd == null || !cmd.equals("updateJobTable"))
+          {
+            // Request not intended for this servlet, forward to ListJobs
+            setForwardTo(ListJobs.class);
+            return;
+          }
           resp.setContentType("application/json");
           //resp.setCharacterEncoding("UTF-8");

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
+  var cmd = 'updateJobTable';
   // Get job id values in comma-separated list
   var jobIdList = getJobIdList();
-  var url = 'app?action=org.proteios.action.job.ListJobsAjax&jobIdList=' + jobIdList;
+  var url = 'app?action=org.proteios.action.job.ListJobsAjax&cmd=' + cmd + '&jobIdList=' + jobIdList;
   var request = new XMLHttpRequest();
   request.open("GET", url, false);