diff --git a/db_export/make_tar.sh b/db_export/make_tar.sh index c99f08b76e7a421ea168f8883b47c829f8f57f40..a4c4f002194f625540070c124e1d84f153a6defa 100755 --- a/db_export/make_tar.sh +++ b/db_export/make_tar.sh @@ -13,7 +13,7 @@ else if test -z $ok; then ok="n"; fi if test "$ok" = "j"; then echo "create tar from xataface xataface-2.1.2/ master/ template/ favicon.ico index.html info.php" - tar --exclude-vcs -czf db_export/mpidb_mpg_common.tar.gz xataface xataface-2.1.2/ master/ template/ favicon.ico index.html info.php + tar --exclude-vcs -czf db_export/mpidb_mpg_common.tar.gz xataface xataface-2.1.2/ xataface-2.1.3/ master/ template/ favicon.ico index.html info.php fi execute="mpg_*" @@ -32,5 +32,5 @@ for project in $execute; do echo "create tar from plain project ${project}" tar --exclude-vcs -czf db_export/mpidb_${project}.tar.gz ${project}/ echo "create tar from project ${project} with common files" - tar --exclude-vcs -czf db_export/mpidb_${project}_full.tar.gz xataface xataface-2.1.2/ master/ template/ favicon.ico index.html info.php LICENSE.txt ${project}/ + tar --exclude-vcs -czf db_export/mpidb_${project}_full.tar.gz xataface xataface-2.1.2/ xataface-2.1.3/ master/ template/ favicon.ico index.html info.php LICENSE.txt ${project}/ done diff --git a/db_export/mpidb_mpg_licman.tar.gz b/db_export/mpidb_mpg_licman.tar.gz index ed5edacf9b9f11029d0b864390358bb5508e4b8c..7050246a153170191afe742820b7215928c9759a 100644 Binary files a/db_export/mpidb_mpg_licman.tar.gz and b/db_export/mpidb_mpg_licman.tar.gz differ diff --git a/db_export/mpidb_mpg_licman_full.tar.gz b/db_export/mpidb_mpg_licman_full.tar.gz index 7a83f645888e5d1d58db86c403b93793541341e0..5ebad225aef60633f8ec409732f1f6c9fd6b5871 100644 Binary files a/db_export/mpidb_mpg_licman_full.tar.gz and b/db_export/mpidb_mpg_licman_full.tar.gz differ diff --git a/index.html b/index.html index efc511384e965e469c4b13f76b583f33957cfd15..4eabb5f3cd7f1663ba3a4ed5512817b48dbc896e 100644 --- a/index.html +++ b/index.html @@ -58,7 +58,6 @@ <ul id="table_selection_tabs"> <li class="nav tab_06"><a href="/it_inv" title="Tabelle Inventar"> Inventar </a></li> <li class="nav tab_06"><a href="/it_licman" title="Tabelle Lizenzmanager"> Lizenzmanager </a></li> - <li class="nav tab_06"><a href="/it_user/index.php?-table=main_benutzer&expired==0" title="Tabelle Benutzer"> Benutzer </a></li> <li class="nav tab_06"><a href="/user" title="Tabelle Benutzer"> Fiona </a></li> <li class="nav tab_06"><a href="/it_lab" title="Tabelle LaborUser"> Labor User </a></li> <li class="nav tab_06"><a href="/it_tel" title="Tabelle Telefone"> Telefon </a></li> diff --git a/master/tables/sys_user/sys_user.sql b/master/tables/sys_user/sys_user.sql index f41bb9087e0a6c231bf0c3e84cb2c51971e7fbf8..59ca3ebc48f48f05eaf1dd96ea709d4a3be52e7d 100644 --- a/master/tables/sys_user/sys_user.sql +++ b/master/tables/sys_user/sys_user.sql @@ -46,7 +46,7 @@ BEGIN `login` varchar(20) COLLATE utf8_unicode_ci NOT NULL, `role` varchar(20) COLLATE utf8_unicode_ci NOT NULL, `email` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL, - `bearbeiter` varchar(20) COLLATE utf8_unicode_ci NOT NULL, + `bearbeiter` varchar(20) COLLATE utf8_unicode_ci NULL, `zeitstempel` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; -- unique, pri diff --git a/master/templates/user_telefon.html b/master/templates/user_telefon.html index a5ba89664835e2b87f2a4c1e681b74a555148c3c..8da407dfc0925cf3369e94c79ff4d3d45e814502 100644 --- a/master/templates/user_telefon.html +++ b/master/templates/user_telefon.html @@ -1,6 +1,6 @@ {assign var=table value=main_telefon} <div class="Dataface_collapsible_sidebar-closed" style="display: block;"> - <table class="Dataface_QuickForm-table-wrapper xf-form-group"> + <table width="100%" class="Dataface_QuickForm-table-wrapper xf-form-group"> <tbody> <tr> diff --git a/template/install/exportDatabase.sh b/template/install/exportDatabase.sh index 7e8b761a24ef1085c6bbfed932af24cde65d7226..83f3665e561413047b035033d07b27ec8e57f123 100755 --- a/template/install/exportDatabase.sh +++ b/template/install/exportDatabase.sh @@ -20,4 +20,4 @@ if test -z $ok; then ok="n"; fi if test "$ok" != "y"; then exit 0; fi - /usr/bin/mysqldump -p --events --skip-extended-insert --skip-comments --databases $db > $PWD/$db.sql + /usr/bin/mysqldump -p --events --routines --skip-extended-insert --skip-comments --databases $db > $PWD/$db.sql