MNNL#54862 Van verwerkte meldingen mogen nu niet meer de bijlage(n) worden verwijderd.

svn path=/Website/branches/v2018.1/; revision=39343

APPL/Shared/BijlagenForm.asp

@@ -230,7 +230,8 @@ if (fso.FolderExists(params.AttachPath))
         document.forms.finder.target="_self";
         document.forms.finder.submit();
       }
-
+<%    if (params.canDelete)
+      { %>
       function DeleteFile(fname, safeDeleteurl)
       {
         FcltMgr.confirm(L("lcl_delete") + " " + safeFilename(fname) + "?", function() {
@@ -242,7 +243,7 @@ if (fso.FolderExists(params.AttachPath))
             );
         });
       }
-
+<%    } %>
       function validateFile(file)
       {
         // Controleer extenties
@@ -276,7 +277,7 @@ if (fso.FolderExists(params.AttachPath))
         if (document.forms.u2.imgfile.value == "" && !looseFiles.length)
             return false;
 
-        // Officieel lte IE9 niet meer gesupport, dus .files mag gebruikt worden
+        // Officieel lte IE9 niet meer supported, dus .files mag gebruikt worden
         var fileList = looseFiles.length ? looseFiles : document.forms.u2.imgfile.files;
         var loopFiles = isMultiple ? fileList.length : (fileList.length ? 1 : 0);
 
@@ -287,7 +288,7 @@ if (fso.FolderExists(params.AttachPath))
                 return false;
         }
 
-        // Controleer of de te uploaden bestand al bestaat.
+        // Controleer of het te uploaden bestand al bestaat.
         var tName = "";
         var equals = [];
         var fTable = document.getElementById("filetable");
@@ -407,7 +408,7 @@ if (fso.FolderExists(params.AttachPath))
           <th><%=L("lcl_filename")%></th>
           <th style='text-align:right'><%=L("lcl_filedate")%></th>
           <th style='text-align:right'><%=L("lcl_filesize")%></th>
-<%        if (!pReado)
+<%        if (!pReado && params.canDelete)
           { %>
             <th><%=L("lcl_filedelete")%></th>
 <%        } %>
@@ -438,7 +439,7 @@ if (fso.FolderExists(params.AttachPath))
               </TD>
               <TD align='right'><%=toDateTimeString(fileArray[i].vDateStr)%></TD>
               <TD align='right'><%=fileArray[i].vFileSize%></TD>
-<%            if (!pReado && (!params.keephistory || fileArray[i].ishistory))
+<%            if (!pReado && (!params.keephistory || fileArray[i].ishistory) && params.canDelete)
               { %>
                 <td align=center><span onClick="DeleteFile('<%=safe.jsstring(safe.html(fileArray[i].vFileName))%>', '<%=safe.jsstring(protectQS.create("Bijlagenform_delete.asp?DoDelete="+Server.URLEncode(fileArray[i].vFileName)+transitParam))%>')"
                     class='fa fa-trash fa-lg' title='<%=L("lcl_filedelete")%>'></span>

APPL/Shared/FlexFiles.inc

@@ -163,7 +163,7 @@ function flexProps2(flexcode)
 function flexProps(pModule, pKey, pSubpath, pNiveau, params)
 {
   params = params || {};
-  var result = { directlink: false, files: [] };
+  var result = { canDelete: true, directlink: false, files: [] };
   switch (pModule)
   {
       case "FGII": // Facilitor Graphics
@@ -380,6 +380,19 @@ function flexProps(pModule, pKey, pSubpath, pNiveau, params)
     }
   }
 
+  // result.canDelete;
+  if (pModule == "MLD")
+  {
+      // Van verwerkte (6) meldingen mag je de bijlagen niet meer verwijderen
+      var sql = "SELECT mld_melding_status"
+              + "  FROM mld_melding"
+              + " WHERE mld_melding_key = " + pKey;
+      var oRs = Oracle.Execute(sql);
+      if (!oRs.eof) // Of mag ik hier altijd uitgaan van een correcte pKey?
+          result.canDelete = oRs("mld_melding_status").Value != 6;
+      oRs.Close();
+  }
+
   result.isAllowedName = function _isAllowedName(FileName)
   {
       if (result.extFilter)

APPL/Shared/UploadForm_save.asp

@@ -160,7 +160,7 @@ var fso = Server.CreateObject("Scripting.FileSystemObject")
                       BinaryStream.Write(finfo.data);
                       // Save binary data To disk
                       __Log("Saving to: " + params.AttachPath + safefilename);
-                      if (params.keephistory && fso.FileExists(params.AttachPath + safefilename))
+                      if (params.keephistory && fso.FileExists(params.AttachPath + safefilename) && params.canDelete)
                       {
                         var jsDate = new Date();
                         var backupTime = String(jsDate.getFullYear()) + padout(jsDate.getMonth() + 1) + padout(jsDate.getDate()) + "_"
@@ -170,7 +170,7 @@ var fso = Server.CreateObject("Scripting.FileSystemObject")
                         fso.MoveFile(params.AttachPath + safefilename, params.AttachPath + backupName);
                         __DoLog("Replaced {0}, previous version in {1}".format(params.AttachPath + safefilename, backupName));
                       }
-                      BinaryStream.SaveToFile(params.AttachPath + safefilename, 2); // adSaveCreateOverWrite
+                      BinaryStream.SaveToFile(params.AttachPath + safefilename, (params.canDelete ? 2 : 1)); // adSaveCreateOverWrite
                   }
                   result.safefilename.push(safefilename);
               }