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

FSN#36975 Ook overrulede bonteksten kunnen aangeven

Browse Source 
svn path=/Website/trunk/; revision=30583
This commit is contained in:
Jos Groot Lipman
2016-09-06 11:50:21 +00:00
parent 53048f4712
commit 735d5fec18
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
APPL/FAC/fac_locale_list_std.asp
View File

@@ -71,16 +71,17 @@ var vWhere = "";
}
if (vModule != "-1")
{
sqln +=" AND l.fac_locale_xsl_label IN "
+ " (SELECT l2.fac_locale_xsl_label "
sqln +=" AND (l.fac_locale_xsl_label, l.fac_locale_xsl_module) IN "
+ " (SELECT l2.fac_locale_xsl_label, l2.fac_locale_xsl_module "
+ " FROM fac_locale_xsl l2,"
+ " fac_locale_xref x2"
+ " WHERE x2.fac_locale_xsl_key = l2.fac_locale_xsl_key"
+ " AND x2.fac_locale_xref_filepath LIKE "+safe.quoted_sql("%/" + vModule + "/%")
+ " WHERE x2.fac_locale_xsl_key(+) = l2.fac_locale_xsl_key"
+ " AND (x2.fac_locale_xref_filepath LIKE "+safe.quoted_sql("%/" + vModule + "/%")
+ " OR l2.fac_locale_xsl_module = " + safe.quoted_sql_upper(vModule) + ")"
+ " ) ";
}
sqln += " GROUP BY fac_locale_xsl_label, fac_locale_xsl_module"
+ " ORDER BY fac_locale_xsl_label";
+ " ORDER BY REPLACE(fac_locale_xsl_label, 'lcl_', ''), fac_locale_xsl_module";
%>
@@ -132,7 +133,7 @@ var vWhere = "";
rst.addColumn(new Column({hasActions: true, caption:L("lcl_fac_module"), content:"fac_locale_xsl_module"}));
rst.addColumn(new Column({hasActions: true, caption:L("lcl_lcl_xsl_label"), content:fnNaam}));
rst.addColumn(new Column({hasActions: true, caption:L("lcl_lcl_n_file"), content:"n_file"}));
rst.addColumn(new Column({hasActions: true, caption:L("lcl_lcl_n_file"), content:"n_file", datatype: "number"}));
// Toon het variabel aantal kolommen voor Taal/Dialect
for (var l in S("language_toggles"))

4
APPL/FAC/fac_locale_search_std.asp
View File

@@ -75,10 +75,10 @@ var authparams = user.checkAutorisation(autfunction);
+ " module, "
+ " fac_locale_xref_filepath "
+ " FROM fac_locale_xref) "
+ " SELECT DISTINCT module, COALESCE (fac_module_remark, UPPER (module)) "
+ " SELECT DISTINCT module, NVL2 (fac_module_remark, UPPER(module) || ' ' || fac_module_remark, UPPER (module)) "
+ " FROM modxref, fac_module "
+ " WHERE UPPER (module) = fac_module_name(+) "
+ "ORDER BY COALESCE (fac_module_remark, UPPER (module))";
+ "ORDER BY 2";
sql = "SELECT * FROM (" + sql + ")";
FCLTselector("sModule",
sql,