Rev: 4712rev4712

2 files changed, 5 insertions, 2 deletions

diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/hazifeladat-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/hazifeladat-pre.php
index 86ca57a0..a973e454 100644
--- a/mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/hazifeladat-pre.php
+++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/hazifeladat-pre.php
@@ -80,7 +80,8 @@
 	}
 	if ($oraId>0 && $ADAT['oraAdat']['oraBeirhato']===true ) {
 	    $leiras = readVariable($_POST['oraLeiras'],'string');
-	    updateHaladasiNaploOra($oraId, $leiras);
+	    $cimkeId = readVariable($_POST['cimkeId'],'string');
+	    updateHaladasiNaploOra($oraId, $leiras, $cimkeId);
 	}
     } elseif (__TANAR===true && $action=='lattam') {
 	$lr = db_connect('naplo');
diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/tools/getOraAdat-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/tools/getOraAdat-pre.php
index 064bc796..308e7b4f 100644
--- a/mayor-orig/mayor-naplo/www/policy/private/naplo/tools/getOraAdat-pre.php
+++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/tools/getOraAdat-pre.php
@@ -25,7 +25,8 @@
 	$dolgozatBeirhato = $oraBeirhato;
 	if ($oraBeirhato===true && $action=='oraBeiras') {
 	    $leiras = readVariable($_POST['leiras'], 'string');
-	    updateHaladasiNaploOra($oraId,$leiras);
+	    $cimkeId = readVariable($_POST['cimkeId'], 'id');
+	    updateHaladasiNaploOra($oraId,$leiras,$cimkeId);
 	}
 	$_JSON['oraAdat'] = $ORAADAT = getOraAdatById($oraId);
 	if ($ORAADAT['hazifeladatId']>0) {
@@ -56,6 +57,7 @@
 	        <input class="mayorToken" type="hidden" name="mayorToken" value="'.$_SESSION['mayorToken'].'" />
 	        <input type="hidden" name="action" value="oraBeiras" />
 	        <input type="hidden" name="oraId" value="'.$oraId.'" />
+	        <input type="hidden" name="cimkeId" value="'.$_JSON['oraAdat']['cimkeId'].'" />
 	        <textarea name="leiras" style="margin-top:8px; width:99%; height:100px;">'. supertext($_JSON['oraAdat']['leiras']).'</textarea>';
 	    $oraForm .= '<button type="button" class="setOraAdat mentes" value="mentés" data-oraid="'.$oraId.'"><span class="icon-ok"></span> MENTÉS </button>';
 	    $oraForm .= '</form>';