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

FSN#36465: Tracking van toevoegen/ verwijderen flex bijlagen.

Browse Source 
svn path=/Website/trunk/; revision=29943
This commit is contained in:
Maykel Geerdink
2016-07-04 13:46:52 +00:00
parent f4f9271370
commit 67199983e2
4 changed files with 36 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
APPL/Shared/BijlagenForm.asp
View File

@@ -47,16 +47,26 @@ var pReado = getQParamInt("reado", 0) == 1;
var showFilter = getFParam("showFilter", ""); // zoek mogelijkheid binnen lijst bestanden
var pDoDelete = getQParam("DoDelete", "");
var pAlgLevel = getQParam("kenmerk_module", "");
var transitParam = buildTransitParam(["key", "module", "niveau", "kenmerk_key", "encrypt", "extFilter", "pregexp", "showFilter", "reado", "multi", "tmpfolder"]);
var transitParam = buildTransitParam(["key", "module", "niveau", "kenmerk_key", "encrypt", "extFilter", "pregexp", "showFilter", "reado", "multi", "tmpfolder", "kenmerk_module"]);
params = flexProps(pModule, pKey, String(pKenmerk_key), pNiveau);
params = flexProps(pModule, pKey, String(pKenmerk_key), pNiveau, {alglevel: pAlgLevel});
__Log("Zoeken bestanden onder " + params.AttachPath);
if (pDoDelete != "")
{
DeleteFile(params.AttachPath + "/" + safe.filename(pDoDelete));
// Verwijderen bijlage tracken.
if (params.trackcode)
{
var ptxt = L("lcl_shared_attachment_delete") + ": " + safe.filename(pDoDelete);
shared.trackaction(params.trackcode, pKey, ptxt);
}
}
function OpenFlexFile(fname)
{
var s = "../shared/BijlagenStream.asp"

10
APPL/Shared/FlexFiles.inc
View File

@@ -142,6 +142,7 @@ function flexProps(pModule, pKey, pSubpath, pNiveau, params)
result.multi = true;
result.regexp = S("bes_photo_size");
result.directlink = true;
result.trackcode = "BESUPD"
break;
case "INSPH":
// Bestanden zijn te vinden op ...cust/x/photos/ins
@@ -152,6 +153,7 @@ function flexProps(pModule, pKey, pSubpath, pNiveau, params)
result.multi = true;
result.regexp = S("ins_photo_size");
result.directlink = true;
result.trackcode = "INSUPD"
break;
case "MLDS": // Stdmelding symbolen
result.AttachRootPath = Server.MapPath(S("mlds_image_path"));
@@ -161,6 +163,7 @@ function flexProps(pModule, pKey, pSubpath, pNiveau, params)
result.extFilter = "jpg|png";
result.regexp = S("mld_photo_size");
result.directlink = true;
result.trackcode = "MLDUPD"
break;
case "ALG":
case "BES":
@@ -180,6 +183,12 @@ function flexProps(pModule, pKey, pSubpath, pNiveau, params)
result.AttachPath += "/" + pSubpath + "/";
result.extFilter = getQParam("extFilter", S("flexExtensionFilter"));
result.regexp = getQParam("pregexp", ""); //P800x600 cropt/resized naar 800x600
if (pModule == "ALG" && params)
{
result.trackcode = pModule + params.alglevel + "UP"
}
else if (pModule != "FAQ")
result.trackcode = pModule + "UPD"
break;
case "RESPH":
// Bestanden zijn te vinden op ...cust/x/photos
@@ -192,6 +201,7 @@ function flexProps(pModule, pKey, pSubpath, pNiveau, params)
result.directlink = true;
if (typeof pKey == "string")
params.filter = pKey;
result.trackcode = "RESUPD"
break;
case "MRK":
result.AttachRootPath = Server.MapPath(S("mrk_image_path"));

10
APPL/Shared/UploadForm_save.asp
View File

@@ -33,8 +33,9 @@ var pKey = getQParamInt("key", -1);
var pNiveau = getQParamSafe("niveau", "");
var pModule = getQParamSafe("module");
var pKenmerk_key = getQParamInt("kenmerk_key", -1);
var pAlgLevel = getQParam("kenmerk_module", "");
var params = flexProps(pModule, pKey, String(pKenmerk_key), pNiveau);
var params = flexProps(pModule, pKey, String(pKenmerk_key), pNiveau, {alglevel: pAlgLevel});
if (params.extFilter)
{
@@ -61,6 +62,13 @@ function jslog(str) // VB Vindt de twee underscores niet leuk
safefilename: VB_result("safefilename")
};
// Toevoegen bijlage tracken.
if (params.trackcode)
{
var ptxt = L("lcl_shared_attachment_add") + ": " + safe.filename(result.safefilename);
shared.trackaction(params.trackcode, pKey, ptxt);
}
if (!result.message && params.forcesingle)
{
// Verwijder alle andere bestanden.

8
APPL/Shared/kenmerk_common.inc
View File

@@ -88,7 +88,7 @@ function BijlagenList(pModule, pNiveau, pKey, pKenmerk_key, otherKenmerk_path)
}
function BijlagenButton(pModule, pNiveau, pKey, tmpfolder, pKenmerk_key,
pReadonly, pRequired, kdim, pregexp, otherKenmerk_path, identify, label)
pReadonly, pRequired, kdim, pregexp, otherKenmerk_path, identify, label, params)
{
// Lever code op voor een BijlagenButton type M (map)
// Let op: F (file) gebeurt verderop in de code
@@ -136,6 +136,8 @@ function BijlagenButton(pModule, pNiveau, pKey, tmpfolder, pKenmerk_key,
url += "&multi=1";
if (kdim) url += "&extFilter=" + escape(kdim);
if (pregexp) url += "&pregexp=" + escape(pregexp); // P800x600 voor foto van 800x600
if (params.kenmerk_module != "")
url += "&kenmerk_module=" + params.kenmerk_module;
var blg = "onBijlagen('" + safe.jsstring(protectQS.create(url)) + "'"
+ ",''" // geen saveUrl
+ ", true" // multi
@@ -968,7 +970,7 @@ function listKenmerk(sql, module, key, props)
var identify = " id='" + nameprefix + idCounter + "val' name='" + nameprefix + idCounter + "val'";
var res = BijlagenButton(module, niveau, key, tmpfolder, kkey, readonlyfield || formobile, // Mobile altijd readonly
requiredfield, kdim, kregexp, otherPath, identify, L("lcl_appendixes_teller"))
requiredfield, kdim, kregexp, otherPath, identify, L("lcl_appendixes_teller"), props)
kv = res.html;
if (res.count > 0)
allCollapsable = false;
@@ -978,7 +980,7 @@ function listKenmerk(sql, module, key, props)
{ // JGL: parent_list is alleen bij workflowmeldingen in *show*mode.
// Meeste parameters hieronder zullen dan ook don't care zijn
var res = BijlagenButton(parent_list[pp].module, niveau, parent_list[pp].key,
tmpfolder, kkey, readonlyfield, requiredfield, kdim, kregexp, otherPath, identify, parent_list[pp].label)
tmpfolder, kkey, readonlyfield, requiredfield, kdim, kregexp, otherPath, identify, parent_list[pp].label, props)
if (res.count > 0)
{
allCollapsable = false;