From 34335eb9cb33602e994b552815a1cc1b0caae8ea Mon Sep 17 00:00:00 2001
From: Maykel Geerdink <maykel.geerdink@aareon.nl>
Date: Wed, 24 Jan 2018 07:30:01 +0000
Subject: [PATCH] UWVA#51404: Pop-up bij bezoekersbalie aan/uit kunnen zetten.

svn path=/Website/trunk/; revision=36690
---
 APPL/BEZ/bez_list.inc | 8 ++++----
 APPL/BEZ/bez_list.js  | 5 +++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/APPL/BEZ/bez_list.inc b/APPL/BEZ/bez_list.inc
index d1dfa00cae..2133a112c0 100644
--- a/APPL/BEZ/bez_list.inc
+++ b/APPL/BEZ/bez_list.inc
@@ -797,7 +797,6 @@ function bez_list(pautfunction, params)
           return JSON.stringify(data);
       }
 
-      var canWriteProp = authparams && authparams.ALGwritelevel < 9 && authparams.PRSwritelevel < 9;
       function fnrowActionEnabler(oRs)
       {
         var tVan = 0;
@@ -811,8 +810,7 @@ function bez_list(pautfunction, params)
         var aantaldone = oRs("aantaldone").Value;
         var eEdit = (fronto || backo || (tVan > tExpire));
         var eDelete = (canDelete || (tVan > tExpire)) && aantaldone == 0;
-        var eProgressProp = S("bez_show_progress_prop") == 2 && canWriteProp;
-        var data = {eEdit: eEdit, eDelete: eDelete, eProgressProp: eProgressProp };
+        var data = {eEdit: eEdit, eDelete: eDelete };
 
         return data;
       }
@@ -1288,7 +1286,9 @@ function bez_list(pautfunction, params)
         rst.addAction({ action: "bezDelete", caption: L("lcl_delete"), enabler: "eDelete", single: true, multi: true, multiOnce: true});
         if ( S("puo_uid") && S("puo_pwd") && S("bez_can_send_sms") && backo )
             rst.addAction({ action: "bezSendSms", caption: L("lcl_bez_send_sms"), single: true, multi: false });
-        rst.addAction({ action: "bezProgressProp", caption: L("lcl_bez_reg_progress_prop"), enabler: "eProgressProp", single: true, multi: false });
+        var canWriteProp = authparams && authparams.ALGwritelevel < 9 && authparams.PRSwritelevel < 9;
+        if (S("bez_show_progress_prop") == 2 && canWriteProp)
+          rst.addAction({ action: "bezProgressProp", caption: L("lcl_bez_reg_progress_prop"), single: true, multi: false });
         if (!frontend && S("vis_allow_check_all") == 1)
         {   // Door enablee: NotExist effectied alleen multi
             rst.addAction({ action: "bezCheckIn", caption: L("lcl_bez_sign_in"), enabler: "NotExist", multi: true, onlyMulti: true, multiOnce: true });
diff --git a/APPL/BEZ/bez_list.js b/APPL/BEZ/bez_list.js
index 4d7eac4ed0..4c9c511dcd 100644
--- a/APPL/BEZ/bez_list.js
+++ b/APPL/BEZ/bez_list.js
@@ -51,16 +51,17 @@ function bezSendSms(row)
 
 function bezProgressProp(row)
 {
+  var bez_key = row.getAttribute("ROWKEY");
   var bezData = eval('(' + row.getAttribute("ROWDATA") + ')');
   if (bezData)
   {
     $(row).addClass('dirty');
-    var url = "../bez/bez_edit_check_in.asp?urole=" + urole + "&bez_key=" + bezData.bez_key;
+    var url = "../bez/bez_edit_check_in.asp?urole=" + urole + "&bez_key=" + bez_key;
     FcltMgr.openModalDetail(url,
                             L("lcl_bez_reg_progress_prop"),
                             { callback: function(data)
                                 {
-                                    $("#badgenr" + bezData.bez_key).val(data.bezBadgeArr[0]);
+                                    $("#badgenr" + bez_key).val(data.bezBadgeArr[0]);
                                 }
                             });
   }