aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorM.Gergo2020-09-22 14:30:03 +0200
committerM.Gergo2020-09-22 14:30:03 +0200
commit4151aba7656fb165c54f9b77553ce96f75a52d51 (patch)
tree35973cc3de279736db69dcb384ddac51992bdc05
parentdc2b3d12c866d02833def3704cbb0725e04ca7a1 (diff)
downloadmayor-7d29ccb94672fd9c3ba78abb33c4685bae234537.tar.gz
mayor-7d29ccb94672fd9c3ba78abb33c4685bae234537.zip
Rev: 4683rev4683
Diffstat
-rw-r--r--mayor-orig/mayor-base/log/mayor-base.rev2
-rw-r--r--mayor-orig/mayor-felveteli/log/mayor-felveteli.rev2
-rw-r--r--mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev2
-rw-r--r--mayor-orig/mayor-installer-orig/log/mayor-installer.rev2
-rw-r--r--mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev2
-rw-r--r--mayor-orig/mayor-jatek/log/mayor-jatek.rev2
-rw-r--r--mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev2
-rw-r--r--mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev2
-rw-r--r--mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev2
-rw-r--r--mayor-orig/mayor-naplo/install/module-naplo/mysql/intezmeny.sql12
-rw-r--r--mayor-orig/mayor-naplo/log/mayor-naplo.rev2
-rw-r--r--mayor-orig/mayor-naplo/update/pre004682-1-intezmeny.sql17
-rw-r--r--mayor-orig/mayor-portal/log/mayor-portal.rev2
-rw-r--r--mayor-orig/mayor-portal/www/skin/classic/module-portal/html/hirek/egyhir.phtml8
-rw-r--r--mayor-orig/mayor-wiki/log/mayor-wiki.rev2
-rw-r--r--mayor-orig/md5sum26
-rw-r--r--mayor-orig/rev.txt2
-rw-r--r--rev.txt2
18 files changed, 58 insertions, 33 deletions
diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev
index ee67738f..44f34c74 100644
--- a/mayor-orig/mayor-base/log/mayor-base.rev
+++ b/mayor-orig/mayor-base/log/mayor-base.rev
@@ -1 +1 @@
-4681
+4683
diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
index ee67738f..44f34c74 100644
--- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
+++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
@@ -1 +1 @@
-4681
+4683
diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
index ee67738f..44f34c74 100644
--- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
+++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
@@ -1 +1 @@
-4681
+4683
diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
index ee67738f..44f34c74 100644
--- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
+++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
@@ -1 +1 @@
-4681
+4683
diff --git a/mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev b/mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev
index ee67738f..44f34c74 100644
--- a/mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev
+++ b/mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev
@@ -1 +1 @@
-4681
+4683
diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
index ee67738f..44f34c74 100644
--- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev
+++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
@@ -1 +1 @@
-4681
+4683
diff --git a/mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev b/mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev
index ee67738f..44f34c74 100644
--- a/mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev
+++ b/mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev
@@ -1 +1 @@
-4681
+4683
diff --git a/mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev b/mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev
index ee67738f..44f34c74 100644
--- a/mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev
+++ b/mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev
@@ -1 +1 @@
-4681
+4683
diff --git a/mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev b/mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev
index ee67738f..44f34c74 100644
--- a/mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev
+++ b/mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev
@@ -1 +1 @@
-4681
+4683
diff --git a/mayor-orig/mayor-naplo/install/module-naplo/mysql/intezmeny.sql b/mayor-orig/mayor-naplo/install/module-naplo/mysql/intezmeny.sql
index 1912a862..8254eb20 100644
--- a/mayor-orig/mayor-naplo/install/module-naplo/mysql/intezmeny.sql
+++ b/mayor-orig/mayor-naplo/install/module-naplo/mysql/intezmeny.sql
@@ -68,10 +68,10 @@ CREATE TABLE `telephely` (
CREATE TABLE `szulo` (
`szuloId` int(10) unsigned NOT NULL AUTO_INCREMENT,
- `nevElotag` varchar(8) COLLATE utf8_hungarian_ci NOT NULL DEFAULT '',
+ `nevElotag` varchar(8) COLLATE utf8_hungarian_ci DEFAULT '',
`csaladinev` varchar(64) COLLATE utf8_hungarian_ci NOT NULL DEFAULT '',
`utonev` varchar(64) COLLATE utf8_hungarian_ci NOT NULL DEFAULT '',
- `szuleteskoriNevElotag` varchar(8) COLLATE utf8_hungarian_ci NOT NULL DEFAULT '',
+ `szuleteskoriNevElotag` varchar(8) COLLATE utf8_hungarian_ci DEFAULT '',
`szuleteskoriCsaladinev` varchar(32) COLLATE utf8_hungarian_ci NOT NULL DEFAULT '',
`szuleteskoriUtonev` varchar(32) COLLATE utf8_hungarian_ci NOT NULL DEFAULT '',
`nem` enum('fiú','lány') COLLATE utf8_hungarian_ci DEFAULT NULL,
@@ -102,10 +102,10 @@ CREATE TABLE `diak` (
`adoazonosito` bigint(10) unsigned zerofill DEFAULT NULL,
`szemelyiIgazolvanySzam` varchar(16) COLLATE utf8_hungarian_ci DEFAULT NULL,
`tartozkodasiOkiratSzam` varchar(16) COLLATE utf8_hungarian_ci DEFAULT NULL,
- `viseltNevElotag` varchar(8) COLLATE utf8_hungarian_ci NOT NULL DEFAULT '',
+ `viseltNevElotag` varchar(8) COLLATE utf8_hungarian_ci DEFAULT '',
`viseltCsaladinev` varchar(64) COLLATE utf8_hungarian_ci NOT NULL DEFAULT '',
`viseltUtonev` varchar(64) COLLATE utf8_hungarian_ci NOT NULL DEFAULT '',
- `szuleteskoriNevElotag` varchar(8) COLLATE utf8_hungarian_ci NOT NULL DEFAULT '',
+ `szuleteskoriNevElotag` varchar(8) COLLATE utf8_hungarian_ci DEFAULT '',
`szuleteskoriCsaladinev` varchar(64) COLLATE utf8_hungarian_ci NOT NULL DEFAULT '',
`szuleteskoriUtonev` varchar(64) COLLATE utf8_hungarian_ci NOT NULL DEFAULT '',
`szuletesiHely` varchar(32) COLLATE utf8_hungarian_ci DEFAULT NULL,
@@ -263,7 +263,7 @@ CREATE TABLE `tanar` (
`oId` bigint(20) unsigned DEFAULT NULL,
`beDt` date DEFAULT NULL,
`kiDt` date DEFAULT NULL,
- `viseltNevElotag` varchar(8) COLLATE utf8_hungarian_ci DEFAULT NULL,
+ `viseltNevElotag` varchar(8) COLLATE utf8_hungarian_ci DEFAULT '',
`viseltCsaladinev` varchar(64) COLLATE utf8_hungarian_ci NOT NULL DEFAULT '',
`viseltUtonev` varchar(64) COLLATE utf8_hungarian_ci NOT NULL DEFAULT '',
`szuletesiHely` varchar(16) COLLATE utf8_hungarian_ci DEFAULT NULL,
@@ -271,7 +271,7 @@ CREATE TABLE `tanar` (
`dn` varchar(128) COLLATE utf8_hungarian_ci DEFAULT NULL,
`szuleteskoriUtonev` varchar(64) COLLATE utf8_hungarian_ci NOT NULL DEFAULT '',
`szuleteskoriCsaladinev` varchar(64) COLLATE utf8_hungarian_ci NOT NULL DEFAULT '',
- `szuleteskoriNevElotag` varchar(8) COLLATE utf8_hungarian_ci NOT NULL DEFAULT '',
+ `szuleteskoriNevElotag` varchar(8) COLLATE utf8_hungarian_ci DEFAULT '',
`hetiMunkaora` decimal(3,1) DEFAULT '0.0',
`NEKAzonosito` varchar(16) COLLATE utf8_hungarian_ci DEFAULT NULL,
`statusz` enum('határozatlan idejű','határozott idejű','tartósan távol','jogviszonya lezárva','külső óraadó') COLLATE utf8_hungarian_ci DEFAULT 'határozatlan idejű',
diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
index ee67738f..44f34c74 100644
--- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev
+++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
@@ -1 +1 @@
-4681
+4683
diff --git a/mayor-orig/mayor-naplo/update/pre004682-1-intezmeny.sql b/mayor-orig/mayor-naplo/update/pre004682-1-intezmeny.sql
new file mode 100644
index 00000000..121f2c88
--- /dev/null
+++ b/mayor-orig/mayor-naplo/update/pre004682-1-intezmeny.sql
@@ -0,0 +1,17 @@
+DELIMITER $$
+DROP PROCEDURE IF EXISTS upgrade_database_4682 $$
+
+CREATE PROCEDURE upgrade_database_4682()
+BEGIN
+SET NAMES utf8 COLLATE utf8_hungarian_ci;
+
+ALTER TABLE `tanar` MODIFY `viseltNevElotag` varchar(8) COLLATE utf8_hungarian_ci DEFAULT '';
+ALTER TABLE `tanar` MODIFY `szuleteskoriNevElotag` varchar(8) COLLATE utf8_hungarian_ci DEFAULT '';
+ALTER TABLE `szulo` MODIFY `nevElotag` varchar(8) COLLATE utf8_hungarian_ci DEFAULT '';
+ALTER TABLE `szulo` MODIFY `szuleteskoriNevElotag` varchar(8) COLLATE utf8_hungarian_ci DEFAULT '';
+ALTER TABLE `diak` MODIFY `viseltNevElotag` varchar(8) COLLATE utf8_hungarian_ci DEFAULT '';
+ALTER TABLE `diak` MODIFY `szuleteskoriNevElotag` varchar(8) COLLATE utf8_hungarian_ci DEFAULT '';
+
+END $$
+DELIMITER ;
+CALL upgrade_database_4682();
diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev
index ee67738f..44f34c74 100644
--- a/mayor-orig/mayor-portal/log/mayor-portal.rev
+++ b/mayor-orig/mayor-portal/log/mayor-portal.rev
@@ -1 +1 @@
-4681
+4683
diff --git a/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/hirek/egyhir.phtml b/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/hirek/egyhir.phtml
index c75b2756..afebf8bc 100644
--- a/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/hirek/egyhir.phtml
+++ b/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/hirek/egyhir.phtml
@@ -27,6 +27,7 @@
formBegin();
if (__HIREKADMIN===true) {
+ echo '<script src="//cdn.ckeditor.com/4.14.0/standard/ckeditor.js"></script>';
echo '<table class="egyhirdetail" cellspacing="1">';
echo '<tr><th colspan="3">'._BEALLITASOK.'</th></tr>';
@@ -135,6 +136,13 @@
echo '</div>';
+ echo '<script type="text/javascript">';
+ echo "
+ CKEDITOR.replace('txt', {
+ uiColor: '#eeeeee'
+ });
+";
+ echo '</script>';
if (__HIREKADMIN===true) {
echo '<hr/>';
diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
index ee67738f..44f34c74 100644
--- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev
+++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
@@ -1 +1 @@
-4681
+4683
diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum
index 7c9ee0ee..b0ed190b 100644
--- a/mayor-orig/md5sum
+++ b/mayor-orig/md5sum
@@ -1,13 +1,13 @@
-Revision 4681
-15c2a2e023f8d05716b1baed93973bdc mayor-fenntarto-rev4681.tgz
-46aa3cf4b5efa5ee0ca4cf78d8cc1eaf mayor-installer-sulix-rev4681.tgz
-a014e0b2366869b03f60954498f55e63 mayor-wiki-rev4681.tgz
-754361c37b37ae4cc9cf9e6f8d647c7d mayor-installer-rev4681.tgz
-4d879e5cf7746acd5f12d84bee8717a8 mayor-portal-rev4681.tgz
-393e2c0e36081ba94e8b547b6ed03a7c mayor-felveteli-rev4681.tgz
-8b4e6e23d43ffba1a2e351200a03fd47 mayor-jatek-rev4681.tgz
-b42789275534e1b605ce8611fef58534 mayor-locales-jp_JP-rev4681.tgz
-af3e34234540ba2adddd58bb844e8baa mayor-locales-de_DE-rev4681.tgz
-77483820d31eab179c30146544683ccf mayor-locales-en_US-rev4681.tgz
-76f0f3df73e4fc536bd2075e5ecfb5d7 mayor-naplo-rev4681.tgz
-456ef5dcce3b8420acceff4170d38ff7 mayor-base-rev4681.tgz
+Revision 4683
+5ab848461fcb7c8f0e675e0ba565dfb6 mayor-fenntarto-rev4683.tgz
+acab3f4d1dc57153e4737352e0b2513e mayor-installer-sulix-rev4683.tgz
+67c861aee289395a3cb38590d67ce66a mayor-wiki-rev4683.tgz
+6f0f8a265ca71ed5eedd44b33856b3b0 mayor-installer-rev4683.tgz
+f1d56379fd6d7ac8086be051d95e4da5 mayor-portal-rev4683.tgz
+e37c44fb0101398b91fe7c3371399672 mayor-felveteli-rev4683.tgz
+0eff173e22c1dbdb55b53f65eecbaf94 mayor-jatek-rev4683.tgz
+b2c987867d7f4b0c5e2cb6727ec3c9b7 mayor-locales-jp_JP-rev4683.tgz
+11dd8efcac7603550dd6db72476e2a26 mayor-locales-de_DE-rev4683.tgz
+180cebdc87e92c057e8870d8f3b77b91 mayor-locales-en_US-rev4683.tgz
+1d142f81e335acfe4a50fe626a6c864a mayor-naplo-rev4683.tgz
+7a2430870a191b80dc09cba2322b4b0d mayor-base-rev4683.tgz
diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt
index ee67738f..44f34c74 100644
--- a/mayor-orig/rev.txt
+++ b/mayor-orig/rev.txt
@@ -1 +1 @@
-4681
+4683
diff --git a/rev.txt b/rev.txt
index ee67738f..44f34c74 100644
--- a/rev.txt
+++ b/rev.txt
@@ -1 +1 @@
-4681
+4683
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-27 23:25:13 +0000