PNBR#26815 Kennisbank aan meerdere meldingen

svn path=/Website/trunk/; revision=18646

APPL/FAC/fac_faq_list.asp

@@ -25,6 +25,7 @@ var stdm_key_arr = getQParamIntArray("stdmmulti", []); // Melding (Stdmelding)
 var fac_faq_level = getQParamInt("fac_faq_level", -1); // Zichtbaar voor
 var fac_faq_lang = getQParam("fac_faq_lang", null); // Taal
 if (fac_faq_lang == "-1") fac_faq_lang = null;
+
 disc_key_arr = (disc_key_arr.length > 0 ? disc_key_arr : null);
 stdm_key_arr = (stdm_key_arr.length > 0 ? stdm_key_arr : null);
 
@@ -123,6 +124,11 @@ function make_faq_list (searchtext, ororand)
 
       if (fac_faq_lang != null)
         sql += " AND f.fac_faq_lang LIKE " + safe.quoted_sql(fac_faq_lang);
+      else
+      {
+        if (!authparamsBOF && !authparamsFOF)
+            sql += " AND (f.fac_faq_lang = " + safe.quoted_sql(user.lang()) + " OR f.fac_faq_lang IS NULL)";
+      }
 
       if (!authparamsBOF)
       {
@@ -132,8 +138,7 @@ function make_faq_list (searchtext, ororand)
         if (authparamsUSE)
             bits += 1;
         sql += " AND BITAND (fac_faq_level, " + bits + ") <> 0";
-        sql += " AND ROWNUM < " + S("faq_max_results")
-            +  " AND (fac_faq_datum < SYSDATE OR prs_perslid_key = " + user_key + ")"; // zelf ingevoerd zie je wel terug
+        sql += " AND (fac_faq_datum < SYSDATE OR prs_perslid_key = " + user_key + ")"; // zelf ingevoerd zie je wel terug
       }
       sql += " ORDER BY fac_faq_rank DESC NULLS LAST"
            + "        , fac_faq_datum DESC"
@@ -187,7 +192,7 @@ function make_faq_list (searchtext, ororand)
       var vakgroep = "";
       if (oRs("mld_stdmelding_count").value > 1)
       {
-        vakgroep = L("lcl_faq_stdmelding_m");
+        vakgroep = L("lcl_faq_stdmelding_m").format(oRs("mld_stdmelding_count").value);
       }
       else
       {

APPL/MLD/mld_2faq_save.asp

@@ -26,10 +26,11 @@
   var authparams = user.checkAutorisation(autfunction);
   user.auth_required_or_abort(authparams.PRSwritelevel<9);
 
-  var sqlm = "SELECT mld_stdmelding_key"
+  var sqlm = "SELECT mm.mld_stdmelding_key"
            + "     , mld_ins_discipline_key"
-           + "  FROM mld_melding"
-           + " WHERE mld_melding_key = " + mld_key;
+           + "  FROM mld_melding mm, mld_stdmelding msm"
+           + " WHERE mld_melding_key = " + mld_key
+           + "   AND mm.mld_stdmelding_key = msm.mld_stdmelding_key";
   var oRs = Oracle.Execute(sqlm);
 
   var fields =  [ { dbs: "fac_faq_question", typ: "varchar",  frm: "fac_question", len: 4000 },

APPL/MLD/mld_faq.asp

@@ -70,7 +70,7 @@ user.auth_required_or_abort(authparamsUSE || authparamsFOF);
     if (authparamsUSE)
         faq_bits += 1;
 
-      var sql = "SELECT fac_faq_key, fac_faq_question, fac_faq_answer, fac_faq_url, fac_faq_level"
+      var sql = "SELECT ff.fac_faq_key, fac_faq_question, fac_faq_answer, fac_faq_url, fac_faq_level"
              + "  FROM fac_faq ff"
              + "     , mld_stdmeldingfaq sf"
              + " WHERE ff.fac_faq_key = sf.fac_faq_key"