admin/Facilitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FCLT#56655 canDeleteNoteAttachment wordt nu in mld_show_note2.asp bepaald

Browse Source 
svn path=/Website/trunk/; revision=41120
This commit is contained in:
Koen Reefman
2019-02-22 13:32:17 +00:00
parent 3bec2a2597
commit 8880bd188a
3 changed files with 11 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
APPL/MLD/mld_show_note2.asp
View File

@@ -46,6 +46,7 @@ user.auth_required_or_abort(mfe.canReadNotes);
var eigenMelding = user_key == mld_info.melder_key || user.isCollega(mld_info.melder_key); var eigenMelding = user_key == mld_info.melder_key || user.isCollega(mld_info.melder_key);
var afgehandeld = (mld_info.mld_status == 1 || mld_info.mld_status == 5 || mld_info.mld_status == 6); var afgehandeld = (mld_info.mld_status == 1 || mld_info.mld_status == 5 || mld_info.mld_status == 6);
var canDeleteNoteAttachment = (mld_info.mld_status == 6 ? 0 : 1);
var timestamp_notes = new Date(); var timestamp_notes = new Date();
var kenmerk_key_arr = []; var kenmerk_key_arr = [];
@@ -156,7 +157,7 @@ if (mld_key > 0)
<% <%
for (var i = 0; i < kenmerk_key_arr.length; i++) for (var i = 0; i < kenmerk_key_arr.length; i++)
{ %> { %>
url[<%=i%>] = "<%=protectQS.create("../Shared/BijlagenForm.asp?module=MLD&niveau=M&multi=1&key=" + mld_key + "&kenmerk_key=" + kenmerk_key_arr[i])%>"; url[<%=i%>] = "<%=protectQS.create("../Shared/BijlagenForm.asp?module=MLD&niveau=M&multi=1&delete=" + canDeleteNoteAttachment + "&key=" + mld_key + "&kenmerk_key=" + kenmerk_key_arr[i])%>";
<% } <% }
if (kenmerk_key_arr.length) if (kenmerk_key_arr.length)
{ %> { %>

9
APPL/Shared/BijlagenForm.asp
View File

@@ -49,6 +49,7 @@ protectQS.verify({ allowparams: ["no_autoscroll"]}); // tamper check
var pKenmerk_key = getQParamInt("kenmerk_key", -1); var pKenmerk_key = getQParamInt("kenmerk_key", -1);
var pMulti = getQParamInt("multi", 0) == 1; var pMulti = getQParamInt("multi", 0) == 1;
var pReado = getQParamInt("reado", 0) == 1; var pReado = getQParamInt("reado", 0) == 1;
var pDelete = getQParamInt("delete", 0) == 1;
var showFilter = getFParam("showFilter", ""); // zoek mogelijkheid binnen lijst bestanden var showFilter = getFParam("showFilter", ""); // zoek mogelijkheid binnen lijst bestanden
var pAlgLevel = getQParam("kenmerk_module", ""); var pAlgLevel = getQParam("kenmerk_module", "");
@@ -230,7 +231,7 @@ if (fso.FolderExists(params.AttachPath))
document.forms.finder.target="_self"; document.forms.finder.target="_self";
document.forms.finder.submit(); document.forms.finder.submit();
} }
<% if (params.canDelete) <% if (pDelete)
{ %> { %>
function DeleteFile(fname, safeDeleteurl) function DeleteFile(fname, safeDeleteurl)
{ {
@@ -307,7 +308,7 @@ if (fso.FolderExists(params.AttachPath))
} }
} }
} }
<% if (!params.canDelete) <% if (!pDelete)
{ %> { %>
if (equals.length) if (equals.length)
FcltMgr.alert("<%=L("lcl_shared_file_no_overwrite")%>"); FcltMgr.alert("<%=L("lcl_shared_file_no_overwrite")%>");
@@ -421,7 +422,7 @@ if (fso.FolderExists(params.AttachPath))
<th><%=L("lcl_filename")%></th> <th><%=L("lcl_filename")%></th>
<th style='text-align:right'><%=L("lcl_filedate")%></th> <th style='text-align:right'><%=L("lcl_filedate")%></th>
<th style='text-align:right'><%=L("lcl_filesize")%></th> <th style='text-align:right'><%=L("lcl_filesize")%></th>
<% if (!pReado && params.canDelete) <% if (!pReado && pDelete)
{ %> { %>
<th><%=L("lcl_filedelete")%></th> <th><%=L("lcl_filedelete")%></th>
<% } %> <% } %>
@@ -452,7 +453,7 @@ if (fso.FolderExists(params.AttachPath))
</TD> </TD>
<TD align='right'><%=toDateTimeString(fileArray[i].vDateStr)%></TD> <TD align='right'><%=toDateTimeString(fileArray[i].vDateStr)%></TD>
<TD align='right'><%=fileArray[i].vFileSize%></TD> <TD align='right'><%=fileArray[i].vFileSize%></TD>
<% if (!pReado && (!params.keephistory || fileArray[i].ishistory) && params.canDelete) <% if (!pReado && (!params.keephistory || fileArray[i].ishistory) && pDelete)
{ %> { %>
<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))%>')" <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> class='fa fa-trash fa-lg' title='<%=L("lcl_filedelete")%>'></span>

15
APPL/Shared/FlexFiles.inc
View File

@@ -165,7 +165,7 @@ function flexProps2(flexcode)
function flexProps(pModule, pKey, pSubpath, pNiveau, params) function flexProps(pModule, pKey, pSubpath, pNiveau, params)
{ {
params = params || {}; params = params || {};
var result = { canDelete: true, directlink: false, files: [] }; var result = { directlink: false, files: [] };
switch (pModule) switch (pModule)
{ {
case "FGII": // Facilitor Graphics case "FGII": // Facilitor Graphics
@@ -395,19 +395,6 @@ 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) result.isAllowedName = function _isAllowedName(FileName)
{ {
if (result.extFilter) if (result.extFilter)