aboutsummaryrefslogtreecommitdiffstats
path: root/mayor-orig/mayor-naplo
diff options
context:
space:
mode:
authorM.Gergo2020-03-18 03:21:19 +0100
committerM.Gergo2020-03-18 03:21:19 +0100
commit25b091e6e06862ee7f7631471c47f9cd94a2019f (patch)
tree4466d5a0dae86fcef7e7003743c5b883b0ead4ce /mayor-orig/mayor-naplo
parent6345ea101955e59386b6b0be0309bd4e84cd98f9 (diff)
downloadmayor-25b091e6e06862ee7f7631471c47f9cd94a2019f.tar.gz
mayor-25b091e6e06862ee7f7631471c47f9cd94a2019f.zip
Rev: 4622rev4622
Diffstat (limited to 'mayor-orig/mayor-naplo')
-rw-r--r--mayor-orig/mayor-naplo/log/mayor-naplo.rev2
-rw-r--r--mayor-orig/mayor-naplo/www/include/modules/naplo/base/rights.php1
-rw-r--r--mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/haladasi-pre.php5
-rw-r--r--mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/naplo.jquery.min.js6
4 files changed, 10 insertions, 4 deletions
diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
index a28d2964..25199c9d 100644
--- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev
+++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
@@ -1 +1 @@
-4620
+4622
diff --git a/mayor-orig/mayor-naplo/www/include/modules/naplo/base/rights.php b/mayor-orig/mayor-naplo/www/include/modules/naplo/base/rights.php
index fd538da0..a0377a17 100644
--- a/mayor-orig/mayor-naplo/www/include/modules/naplo/base/rights.php
+++ b/mayor-orig/mayor-naplo/www/include/modules/naplo/base/rights.php
@@ -434,6 +434,7 @@ if (__NAPLO_INSTALLED === true) {
} elseif (defined('__PARENTDIAKID')) {
define('__USERDIAKID',__PARENTDIAKID);
define('__USERSZULOID', getSzuloIdByUserAccount(("$page/$sub/$f" != 'naplo//diakValaszto')));
+// } elseif (_POLICY === 'parent') {
} elseif ("$page/$sub/$f" != 'naplo//diakValaszto') {
header('Location: '.location('index.php?page=naplo&f=diakValaszto'));
} else {
diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/haladasi-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/haladasi-pre.php
index 31511d7b..79d49bd0 100644
--- a/mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/haladasi-pre.php
+++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/haladasi-pre.php
@@ -110,6 +110,7 @@ if ( $skin == 'ajax'
// set defaults ++
// if (strtotime($igDt) > strtotime($_TANEV['zarasDt'])) $igDt = $_TANEV['zarasDt'];
$maxIgDt = date('Y-m-d', strtotime('next Saturday', strtotime($_TANEV['kovetkezoKezdesDt'])));
+
if (strtotime($igDt) > strtotime($maxIgDt)) $igDt = $maxIgDt;
elseif (strtotime($igDt) < strtotime($_TANEV['kezdesDt'])) $igDt = $_TANEV['kezdesDt'];
if (date('w', strtotime($igDt)) == 0) $igDt = date('Y-m-d',strtotime('-1 days',strtotime($igDt))); // Hogy vasárnap még a múltheti látszódjon
@@ -269,10 +270,10 @@ if ( $skin == 'ajax'
) && (__NAPLOADMIN || __VEZETOSEG)) {
$_NAPOK = _genNapok($tolDt,$igDt);
for ($i=0; $i<count($_NAPOK); $i++) {
- checkNaplo($_NAPOK[$i]);
+ checkNaplo($_NAPOK[$i]);
}
-
}
+
/* ------------------------------------------------- */
// Ezt nem használja a getHaladási...
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/naplo.jquery.min.js b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/naplo.jquery.min.js
index 251155a1..2337a13e 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/naplo.jquery.min.js
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/naplo.jquery.min.js
@@ -385,11 +385,15 @@ ajaxGetZaroJegyAdat = function(zaroJegyId) {
ajaxGetOraAdat = function(oraId) {
+ var policy = $('body').data('policy');
+ if (policy=='parent') { // workaround a szuloknek
+ window.location.replace("index.php?page=naplo&sub=haladasi&f=hazifeladat&policy="+policy+"&sessionID="+$('body').data('sessionid')+"&oraId="+oraId);
+ }
mayorLoaderStart();
postData = { 'oraId':oraId, 'mayorToken': ($('body').data('mayortoken')) }
$.ajax({
type: "POST",
- url: "index.php?page=naplo&sub=tools&f=getOraAdat&policy=private&skin=ajax&sessionID="+$('body').data('sessionid'),
+ url: "index.php?page=naplo&sub=tools&f=getOraAdat&policy="+policy+"&skin=ajax&sessionID="+$('body').data('sessionid'),
data: postData,
dataType: 'json'
}).done(function( msg, status, jqXHR ) {