From 2deef08b06e929ec770ce0141897cc2909286bf3 Mon Sep 17 00:00:00 2001
From: Jos Groot Lipman <jos.grootlipman@aareon.nl>
Date: Wed, 30 Mar 2016 12:52:53 +0000
Subject: [PATCH] FSN#35817 Autorisaties via API2/Scaffolding: in simpel mode
 wel Ja/Nee voor Lezen/Schrijven

svn path=/Website/trunk/; revision=28683
---
 APPL/MGT/fac_edit_groeprechten.asp      | 37 +++++++++++++++----------
 APPL/MGT/fac_edit_groeprechten_save.asp |  9 +++---
 2 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/APPL/MGT/fac_edit_groeprechten.asp b/APPL/MGT/fac_edit_groeprechten.asp
index 0b9c9b5784..c79ac46098 100644
--- a/APPL/MGT/fac_edit_groeprechten.asp
+++ b/APPL/MGT/fac_edit_groeprechten.asp
@@ -104,6 +104,14 @@ function radioTD(name, LOV, val)
             var val = $(this).val();
             switch (this.id)
             {
+                case "allread":
+                    if ($("[name=allwrite]:checked").val() < val)
+                        $("[name=allwrite][value="+val+"]").prop('checked', true); // FireFox doet hier niets als ik #prswrite gebruik?
+                    break;
+                case "allwrite":
+                    if ($("[name=allread]:checked").val() > val)
+                        $("[name=allread][value="+val+"]").prop('checked', true);
+                    break;
                 case "prsread":
                     if ($("[name=prswrite]:checked").val() < val)
                         $("[name=prswrite][value="+val+"]").prop('checked', true); // FireFox doet hier niets als ik #prswrite gebruik?
@@ -171,7 +179,7 @@ function radioTD(name, LOV, val)
         }
       $(function ()
         {   // Zorg dat er altijd zinvolle combinaties overblijven
-            $("#prsread,#prswrite,#algread,#algwrite").change(onchange)
+            $("#prsread,#prswrite,#algread,#algwrite,#allread,#allwrite").change(onchange)
         }
       )
     </script>
@@ -204,8 +212,8 @@ function radioTD(name, LOV, val)
         //        +4 is PRS-scope
         //        +8 is ALG-scope
         var advanced = getQParamInt("advanced", 0) == 1;
-        if (   prsread != prswrite && (flevel & 2)
-            || algread != algwrite && (flevel & 2)
+        if (   prsread != algread
+            || prswrite != algwrite
             || prsread != -1 && prsread != 9
             || algread != -1 && algread != 9
            )
@@ -217,15 +225,17 @@ function radioTD(name, LOV, val)
         if (!advanced)
         {
             Response.Write("<input type='hidden' name='simple_mode' value='1'>");
-            Response.Write("<input type='hidden' name='allread' value='" + (algread==9?'on':'off') + "'>");
-            var desc = api2.splitLOV(L("fac_functie_min_levelLOV"))[flevel];
             if (flevel > 1)
-            {
-                if (algread == 9)
-                    ROFIELDTR("fldtxt", L("fac_gebruiker_toegang"), L("fac_gebruiker_kies_toegang").format(L("fac_gebruiker_toegang"), desc));
-                else
-                    ROFIELDTR("fldtxt", L("fac_gebruiker_toegang"), desc);
-            }
+                ROFIELDTR("fldtxt", L("fac_functie_min_level"), api2.splitLOV(L("fac_functie_min_levelLOV"))[flevel]);
+            Response.Write("<tr><td></td><td><table>");
+            if (flevel & 2)
+                Response.Write("<tr><th>" + L("fac_gebruiker_lezen") + "</th><th>" + L("fac_gebruiker_schrijven") + "</th></tr>");
+            else
+                Response.Write("<tr><th>" + L("fac_gebruiker_toegang") + "</th></tr>");
+            radioTD("allread", jnLOV, algread)
+            if (flevel & 2)
+                radioTD("allwrite", jnLOV, algread)
+            Response.Write("</tr></table></td></tr>");
         }
         else
         {
@@ -288,10 +298,7 @@ function radioTD(name, LOV, val)
         else
             buttons.push ( {title: L("lcl_auth_advanced"),  action:"auth_advanced(1)" } );
         }
-    var label = (prsread == 9?L("fac_gebruiker_toegang"):L("fac_gebruiker_geen_toegang"));
-    if (advanced)
-        var label = L("lcl_submit");
-    buttons.push({ title: label, action: "grp_submit()" });
+    buttons.push({ title: L("lcl_submit"), action: "grp_submit()" });
     buttons.push({ title: L("lcl_cancel"), action: "gen_cancel()" });
 
     CreateButtons(buttons);
diff --git a/APPL/MGT/fac_edit_groeprechten_save.asp b/APPL/MGT/fac_edit_groeprechten_save.asp
index 442b87ed9f..bdf549fb3e 100644
--- a/APPL/MGT/fac_edit_groeprechten_save.asp
+++ b/APPL/MGT/fac_edit_groeprechten_save.asp
@@ -30,11 +30,10 @@ var gr_key = getQParamInt("gr_key", -1);
 var simple_mode = getFParamInt("simple_mode", 0) == 1;
 if (simple_mode)
 {
-    var lvl = (getFParam("allread", "off") == 'on')?-1:9;
-    var prsread  = lvl;
-    var prswrite = lvl;
-    var algread  = lvl;
-    var algwrite = lvl;
+    var prsread  = getFParamInt("allread");
+    var prswrite = getFParamInt("allwrite", prsread);
+    var algread  = prsread;
+    var algwrite = prswrite;
 }
 else
 {