From 56ba96f30aff5ecf4cbe9f9d371f254f5827a869 Mon Sep 17 00:00:00 2001
From: Ruud Lipper <ruud.lipper@aareon.nl>
Date: Thu, 2 Feb 2017 09:55:10 +0000
Subject: [PATCH] FSN#39339 Kan geplande acties niet meer verwijderen vanuit
 lijst

svn path=/Website/branches/v2016.3/; revision=32668
---
 APPL/FAC/job_delete.asp | 30 +++++++++++++++++-------------
 APPL/FAC/job_list.inc   | 26 +++++++++++++++++++++++++-
 APPL/FAC/job_list.js    | 24 ------------------------
 3 files changed, 42 insertions(+), 38 deletions(-)
 delete mode 100644 APPL/FAC/job_list.js

diff --git a/APPL/FAC/job_delete.asp b/APPL/FAC/job_delete.asp
index 0bffeb44e1..0f3dfe9d9f 100644
--- a/APPL/FAC/job_delete.asp
+++ b/APPL/FAC/job_delete.asp
@@ -23,19 +23,23 @@ protectRequest.validateToken();
     var autfunction = "WEB_MLDFOF";
     var authparams = user.checkAutorisation(autfunction);
 
-    var  key = getFParamInt('key');
-
-    // We hebben er nu cascades op staan, en de historie is minder dan irrelevant.
-    sql = "DELETE FROM fac_activiteit WHERE fac_activiteit_key = "+key;
-
-    result = { success: true, deleted: true };
-    var err = Oracle.Execute(sql, true);
-    if (err.friendlyMsg)
-    {
-        result.message = err.friendlyMsg;
-        result.success = false;
-        result.deleted = false;
-    }
+		var job_key_arr = getFParamIntArray("key");
+		var level = getFParam('level');
+		
+		for (var i = 0; i < job_key_arr.length; i++)
+		{
 
+	    // We hebben er nu cascades op staan, en de historie is minder dan irrelevant.
+	    sql = "DELETE FROM fac_activiteit WHERE fac_activiteit_key = " + job_key_arr[i];
+	
+	    result = { success: true, deleted: true };
+	    var err = Oracle.Execute(sql, true);
+	    if (err.friendlyMsg)
+	    {
+	        result.message = err.friendlyMsg;
+	        result.success = false;
+	        result.deleted = false;
+	    }
+		}
     Response.Write(JSON.stringify(result));
 %>
\ No newline at end of file
diff --git a/APPL/FAC/job_list.inc b/APPL/FAC/job_list.inc
index 3397d526bf..2a2f1824ce 100644
--- a/APPL/FAC/job_list.inc
+++ b/APPL/FAC/job_list.inc
@@ -25,8 +25,32 @@ FCLTHeader.Requires({ plugins:["jQuery"],
 
           return JSON.stringify(data);
         }
+
 %>
 <script type="text/javascript">
+	function jobEdit(row)
+	{
+	  var jobData = eval('(' + row.getAttribute("ROWDATA") + ')');
+	  var url = "appl/FAC/job.asp?job_key=" + jobData.job_key;
+	  FcltMgr.openDetail(url, L("lcl_job_title"));
+	}
+
+  function jobDelete(rowArray, isMulti)
+  {
+    FcltMgr.confirm(L("lcl_job_del_txt_job"), { autoconfirm: isMulti }, function() {
+        var jobKeyString = getKeyString(rowArray);
+        var data = {
+            key: jobKeyString,
+            level: "J"
+        };
+        <% protectRequest.dataToken("data"); %>
+        $.post("job_delete.asp",
+            data,
+            FcltCallbackRefresh,
+            "json");
+    });
+  }
+
   var autosearch = 1; // automatisch laden van resultaat op search pagina
 </script>
 <%
@@ -325,7 +349,7 @@ function job_list(pautfunction, params)
     rst.addColumn(new Column({caption: L("lcl_job_lastdate"), content: "fac_activiteit_laatste"}));
 
     rst.addAction({ action: "jobEdit", caption: L("lcl_details"), isDefault:  true});
-    rst.addAction({ action: "jobDelete", caption: L("lcl_delete"), multi: true, single: false});
+    rst.addAction({ action: "jobDelete", caption: L("lcl_delete"), multi: true, single: false, multiOnce: true});
 
     var cnt = rst.processResultset();
 %>
diff --git a/APPL/FAC/job_list.js b/APPL/FAC/job_list.js
deleted file mode 100644
index 44d9f5452b..0000000000
--- a/APPL/FAC/job_list.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-     $Revision$
-     $Id$
-*/
-
-function jobEdit(row)
-{
-  var jobData = eval('(' + row.getAttribute("ROWDATA") + ')');
-  var url = "appl/FAC/job.asp?job_key=" + jobData.job_key;
-  FcltMgr.openDetail(url, L("lcl_job_title"));
-}
-
-function jobDelete(row, isMulti)
-{
-  FcltMgr.confirm(L("lcl_job_del_txt_job"), { autoconfirm: isMulti }, function() {
-      var job_key = row.getAttribute("ROWKEY");
-      $.post("job_delete.asp", {
-              key: job_key,
-              level: "J"
-          },
-          FcltCallbackRefresh,
-          "json");
-  });
-}