FSN#27028 AiAi/IIS Logfile: Either BOF or EOF is True op prs_show_dienst

svn path=/Website/trunk/; revision=18885

APPL/FAC/fac_delete.asp

@@ -54,12 +54,13 @@ else
       + " WHERE " + table + "_key IN (" + key + ")";
 }
 
-result = { success: true };
+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));

APPL/FAC/fac_faq.asp

@@ -49,7 +49,7 @@ FCLTHeader.Requires({plugins:["jQuery", "suggest"], js: ["jquery-ui.js"]})
               {
                 FcltMgr.closeDetail(window, { close: true})
               }
-              if (!params.keepForm)
+              if (!params.keepForm && !params.deleted)
                   $("#facFrame")[0].src = "fac_show_faq.asp?faq_key=<%=faq_key%>";
           <% } %>
       }

APPL/FAC/fac_menu.asp

@@ -53,7 +53,7 @@ FCLTHeader.Requires({plugins:["suggest","jQuery"],
               {
                 FcltMgr.closeDetail(window, { close: true})
               }
-              if (!params.keepForm)
+              if (!params.keepForm && !params.deleted)
                   $("#menuFrame")[0].src = "fac_show_menu.asp?menu_key=<%=menu_key%>&menuitem_key=<%=menuitem_key%>";
           <% } %>
       }

APPL/FAC/fac_show_faq.asp

@@ -37,7 +37,6 @@ var sql = "SELECT fac_faq_question"
         + "  FROM fac_faq f"
         + " WHERE fac_faq_key = " + faq_key;
 var oRs = Oracle.Execute(sql);
-if (oRs.eof) {Response.End(); }
 
 var question = oRs("fac_faq_question").Value;
 var answer = oRs("fac_faq_answer").Value;

APPL/FAC/fac_show_menu.asp

@@ -98,7 +98,6 @@ else if (menu_key != -1)
 }
 
 var oRs = Oracle.Execute(sql);
-if (oRs.eof) {Response.End(); }
 
 if (menuitem_key != -1)
 {

APPL/FAC/faq_delete.asp

@@ -29,12 +29,13 @@ var  faq_key = getFParamInt('faq_key');
 sql = "DELETE FROM fac_faq"
     + " WHERE fac_faq_key = " + faq_key;
 
-result = { success: true};
+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));

APPL/FAC/job.asp

@@ -81,7 +81,7 @@ if (!(MLDFOF_read || MLDFOF_write || BESFOF_read || BESFOF_write || MLDBOF_read
               {
                 FcltMgr.closeDetail(window, {close: true})
               }
-              if (!params.keepForm)
+              if (!params.keepForm && !params.deleted)
                   $("#jobFrame")[0].src = "job_show_job.asp?job_key=<%=job_key%>";
           <% } %>
       }

APPL/FAC/job_delete.asp

@@ -28,12 +28,13 @@ protectRequest.validateToken();
     // 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};
+    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));

APPL/FAC/job_show_job.asp

@@ -58,7 +58,6 @@ var sql = "SELECT "
         + "   AND  fac_activiteit_key = "+job_key;
 
 var oRs = Oracle.Execute(sql);
-if (oRs.eof) {Response.End(); }
 
       interval  = oRs("interval").value;
       aantal    = oRs("fac_activiteit_aantal").value;

APPL/PRS/prs_delete.asp

@@ -138,11 +138,12 @@ else
       + " WHERE " + table + "_key IN (" + ingesloten.join(",") + ")";
 }
 
-result = {success: true};
+result = {success: true, deleted: true};
 var err = Oracle.Execute(sql, true);
 if (err.friendlyMsg)
 {
   result.message = err.friendlyMsg;
+  result.deleted = false;
 }
 else
 {

APPL/PRS/prs_dienst.asp

@@ -62,7 +62,7 @@ FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["jQuery-ui.js"]})
               {
                 FcltMgr.closeDetail(window, { close: true})
               }
-              if (!params.keepForm)
+              if (!params.keepForm && !params.deleted)
                   $("#prsFrame")[0].src = "prs_show_dienst.asp?dloc_key=<%=dloc_key%>";
           <% } %>
       }

APPL/PRS/prs_show_dienst.asp

@@ -67,7 +67,6 @@ else
       + " ORDER BY UPPER (" + lcl.xsql("d.prs_dienst_omschrijving", "d.prs_dienst_key") + ") ASC"
 }
 oRs = Oracle.Execute(sql);
-if (oRs.eof) {Response.End(); }
 
 var prs_bdrkey  = oRs("prs_bedrijf_key").value;
 var prs_dnstkey = oRs("prs_dienst_key").value;