aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorM.Gergo2018-08-26 10:11:34 +0200
committerM.Gergo2018-08-26 10:11:34 +0200
commit228488d05c55a9e6a0a405f7a0e90fc3aab43f87 (patch)
treef72a5e33b4394c633edb2368ef14df3c50d8390b
parent2f5969b827ff17ee05e05f46025367017fdfcf44 (diff)
downloadmayor-228488d05c55a9e6a0a405f7a0e90fc3aab43f87.tar.gz
mayor-228488d05c55a9e6a0a405f7a0e90fc3aab43f87.zip
Rev: 4344
-rwxr-xr-x[-rw-r--r--]checkupdate.sh4
-rw-r--r--mayor-installer-orig/log/mayor-installer.rev2
-rw-r--r--mayor-orig/log/mayor-base.rev2
-rw-r--r--mayor-orig/log/mayor-naplo.rev2
-rw-r--r--mayor-orig/log/mayor-portal.rev2
-rw-r--r--mayor-orig/update/processUpdateScripts.sh12
-rw-r--r--mayor-orig/www/skin/classic/module-naplo/html/haladasi/helyettesites.phtml6
-rw-r--r--rev.txt2
8 files changed, 22 insertions, 10 deletions
diff --git a/checkupdate.sh b/checkupdate.sh
index 0eda521d..5e20e8bd 100644..100755
--- a/checkupdate.sh
+++ b/checkupdate.sh
@@ -25,6 +25,10 @@ if [ "$nrev" -gt "$orev" ]; then
tar -xzf /tmp/mayor-naplo-current.tgz
tar -xzf /tmp/mayor-portal-current.tgz
+
+ cd $pd
+ git add --all
+ git commit -a -m "Rev: $nrev"
fi
diff --git a/mayor-installer-orig/log/mayor-installer.rev b/mayor-installer-orig/log/mayor-installer.rev
index f60afa77..ef758d27 100644
--- a/mayor-installer-orig/log/mayor-installer.rev
+++ b/mayor-installer-orig/log/mayor-installer.rev
@@ -1 +1 @@
-4340
+4344
diff --git a/mayor-orig/log/mayor-base.rev b/mayor-orig/log/mayor-base.rev
index f60afa77..ef758d27 100644
--- a/mayor-orig/log/mayor-base.rev
+++ b/mayor-orig/log/mayor-base.rev
@@ -1 +1 @@
-4340
+4344
diff --git a/mayor-orig/log/mayor-naplo.rev b/mayor-orig/log/mayor-naplo.rev
index f60afa77..ef758d27 100644
--- a/mayor-orig/log/mayor-naplo.rev
+++ b/mayor-orig/log/mayor-naplo.rev
@@ -1 +1 @@
-4340
+4344
diff --git a/mayor-orig/log/mayor-portal.rev b/mayor-orig/log/mayor-portal.rev
index f60afa77..ef758d27 100644
--- a/mayor-orig/log/mayor-portal.rev
+++ b/mayor-orig/log/mayor-portal.rev
@@ -1 +1 @@
-4340
+4344
diff --git a/mayor-orig/update/processUpdateScripts.sh b/mayor-orig/update/processUpdateScripts.sh
index a63578e6..7a96ffef 100644
--- a/mayor-orig/update/processUpdateScripts.sh
+++ b/mayor-orig/update/processUpdateScripts.sh
@@ -46,7 +46,9 @@ fi
# --
run_script() {
- FILEELEJE=`echo $FILE | cut -f 1 -d '-'`
+ # FILEELEJE=`echo $FILE | cut -f 1 -d '-'`
+ # patch by Acsai Gabor <acsi@c3.hu> - FreeBSD
+ FILEELEJE=$(basename $FILE | cut -f 1 -d '-')
FILEREV=${FILEELEJE: -6}
LOGSQL=""
if [ "$FILEREV" != "" ]; then
@@ -55,14 +57,18 @@ run_script() {
fi
fi
if [ ! "${FILEREV}" \< "${REVSTR}" ]; then
- FILEEXT=`echo $FILE | cut -f 2 -d '.'`
+ # FILEEXT=`echo $FILE | cut -f 2 -d '.'`
+ # patch by Acsai Gabor <acsi@c3.hu> - FreeBSD
+ FILEEXT=$(basename $FILE | cut -f 2 -d '.')
if [ "$FILEEXT" == "sh" ]; then
echo " - Szkript futtatása ($FILE)..."
. $FILE
if [ $? != 0 ]; then exit 13; fi
elif [ "$FILEEXT" == "sql" ]; then
echo " - SQL utasítások végrehajtása ($FILE)..."
- FILEDB=`echo $FILE | cut -f 1 -d '.' | cut -f 3 -d '-'`
+ # FILEDB=`echo $FILE | cut -f 1 -d '.' | cut -f 3 -d '-'`
+ # patch by Acsai Gabor <acsi@c3.hu> - FreeBSD
+ FILEDB=$(basename $FILE | cut -f 1 -d '.' | cut -f 3 -d '-')
case "$FILEDB" in
naplo)
DBS=$DB_NAPLO
diff --git a/mayor-orig/www/skin/classic/module-naplo/html/haladasi/helyettesites.phtml b/mayor-orig/www/skin/classic/module-naplo/html/haladasi/helyettesites.phtml
index 1effc9e1..808316e3 100644
--- a/mayor-orig/www/skin/classic/module-naplo/html/haladasi/helyettesites.phtml
+++ b/mayor-orig/www/skin/classic/module-naplo/html/haladasi/helyettesites.phtml
@@ -142,7 +142,8 @@
} else {
$txt = 'nem ered sehonnan!!!!!!!!';
}
- echo '<option value="">'.$txt.$_ki_txt.'</option>'."\n";
+// if ('__HELYETTESITES_RENDEZES' == 'súly')
+ echo '<option value="">'.$txt.$_ki_txt.'</option>'."\n";
if ($tanarOrak[$i]['tipus'] == 'egyéb') {
echo '<option value="/'.$tanarOrak[$i]['oraId'].'/töröl">töröl</option>'."\n";
@@ -190,7 +191,8 @@
$_tanarAdat['súly'] .= '!';
/* */
echo '<option value="'.$value.'" '.($_disabled?' disabled="disabled" ':'').'>'."\n";
- echo ''.$_tanarAdat['súly'].'| '.$_tanarAdat['tanarNev'].' ('.$_tanarAdat['tipus'].') '.$_tanarAdat['txt'];
+ if ('__HELYETTESITES_RENDEZES' == 'súly') echo ''.$_tanarAdat['súly'].'| ';
+ echo $_tanarAdat['tanarNev'].' ('.$_tanarAdat['tipus'].') '.$_tanarAdat['txt'];
echo ' terhelés:';
echo ' '.$ADAT['tanarTerheles'][ $_tanarId ]['lekotott']['heti'];
echo ' '.$ADAT['tanarTerheles'][ $_tanarId ]['kotottEloirt']['heti'];
diff --git a/rev.txt b/rev.txt
index f60afa77..ef758d27 100644
--- a/rev.txt
+++ b/rev.txt
@@ -1 +1 @@
-4340
+4344