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

FSN#34558 Notificaties kunnen vertalen

Browse Source 
svn path=/Website/trunk/; revision=31765
This commit is contained in:
Jos Groot Lipman
2016-12-01 09:39:35 +00:00
parent e82ec13c65
commit 2dbfa872e5
7 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
APPL/API2/api2.inc
View File

@@ -528,7 +528,7 @@ api2 = {
{
dbs = model.table + "." + dbs;
if (field.translate && !params.for_edit)
dbs = lcl.xsql(dbs, model.table + "." + model.fields.id.dbs);
dbs = lcl.xsql(dbs, model.table + "." + model.fields.id.dbs, null, true); // never autolcl
if (model.aliasprefix)
dbs += " AS " + api2.sqlfield_alias(model, fld);
else

2
APPL/CNT/cnt.inc
View File

@@ -732,6 +732,8 @@ cnt = { setcontractstatus:
var oRs = Oracle.Execute(omssql);
var oms = oRs("fac_srtnotificatie_oms").Value;
oRs.Close();
if (oms.substr(0, 9) == 'lcl_noti_')
oms = L(oms);
for (var i = 0; i < approver_arr.length; i++)
{ // Alle fiatteurs een notificatie sturen.

2
APPL/FIN/fin.inc
View File

@@ -1207,6 +1207,8 @@ fin = { func_enabled_factuur: // Wat mag ik zoal op deze specifieke factuur?
var oRs = Oracle.Execute(omssql);
var oms = oRs("fac_srtnotificatie_oms").Value;
oRs.Close();
if (oms.substr(0, 9) == 'lcl_noti_')
oms = L(oms);
Oracle.Execute("BEGIN fac.putnotificationsrtprio(NULL"
+ ", " + approver_key

2
APPL/MLD/mld.inc
View File

@@ -3684,6 +3684,8 @@ __Log(result);
var oRs = Oracle.Execute(omssql);
var oms = oRs("fac_srtnotificatie_oms").Value;
oRs.Close();
if (oms.substr(0, 9) == 'lcl_noti_')
oms = L(oms);
Oracle.Execute("BEGIN fac.putnotificationsrtprio(NULL"
+ ", " + approver_key

11
APPL/SCF/scaffolding.inc
View File

@@ -157,12 +157,12 @@ function scf_ROFIELDTR(model, fld, val, key, params)
return; // Altijd suppressEmpty
}
var org_lcl;
if (field.islcl && txt.substr(0, 4) == 'lcl_')
if (field.islcl && txt && txt.substr(0, 4) == 'lcl_')
{
org_lcl = txt;
txt = L(txt);
if (Session("logging") > 0)
txt += " <<" + org_lcl + ">>";
//if (Session("logging") > 0)
field.label += " <span class='orglcl'>&lt;" + org_lcl + "&gt;</span>";
}
var title = "";
var infoPointer = null;
@@ -270,6 +270,11 @@ function scf_RWFIELDTR(model, fld, val, key, params)
{ // Vanuit scaffolding_search
field = model.fields[fld.replace(/^(start_|end_)/,"")];
}
if (field.islcl && val && val.substr(0, 4) == 'lcl_')
{
return scf_ROFIELDTR(model, fld, val);
}
if (field.foreign)
{
if (typeof field.foreign == 'function')

2
APPL/SCF/scaffolding_list.inc
View File

@@ -327,7 +327,7 @@ function scaffolding_list(model, scf_params)
return function (oRs)
{
var v = oRs.Fields(kolom).Value;
if (v.substr(0, 4) == 'lcl_')
if (v && v.substr(0, 4) == 'lcl_')
return L(v)
else
return safe.html(v);

8
APPL/Shared/locale.inc
View File

@@ -251,7 +251,7 @@ lcl = {
},
xsql2: // standaard zonder kolom-alias
function (pkolomnaam, lclcode, pkey, pwithalias) {
function (pkolomnaam, lclcode, pkey, pwithalias, noautolcl) {
var llocaleclause;
var parts = pkolomnaam.split(".");
if (parts.length ==1)
@@ -264,14 +264,14 @@ lcl = {
if (S("multi_language_option") == 0 || S("language_toggles").length <= 1 || user.lang() == S("db_lang"))
llocaleclause = pkolomnaam+" "+(pwithalias ? alias+" " : "");
else
llocaleclause = " lcl.x('"+lclcode+"', "+pkey+", "+pkolomnaam+")"+(pwithalias ? alias+" " : "");
llocaleclause = " lcl.x('"+lclcode+"', "+pkey+", "+pkolomnaam+", " + (noautolcl?0:1) + ")"+(pwithalias ? alias+" " : "");
if (Session("logging")&4)
llocaleclause = "'$'||"+ llocaleclause;
return llocaleclause;
},
xsql: // standaard zonder kolom-alias
function (pkolomnaam, pkey, pwithalias) {
return lcl.xsql2(pkolomnaam, null, pkey, pwithalias);
function (pkolomnaam, pkey, pwithalias, noautolcl) {
return lcl.xsql2(pkolomnaam, null, pkey, pwithalias, noautolcl);
},
xsqla2: // met kolom-alias
function (pkolomnaam, lclcode, pkey) {