From 84550836c8b7f67ff080f0865ad0191f5b79e6a1 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 20 Nov 2019 17:17:51 +0100 Subject: [PATCH 1/3] started new version 5.1.14 --- CHANGELOG | 4 ++++ inc/inc.Version.php | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 66d9ed9b8..7eaa60ff3 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +-------------------------------------------------------------------------------- + Changes in version 5.1.14 +-------------------------------------------------------------------------------- + -------------------------------------------------------------------------------- Changes in version 5.1.13 -------------------------------------------------------------------------------- diff --git a/inc/inc.Version.php b/inc/inc.Version.php index 868cb1499..bd2c1d827 100644 --- a/inc/inc.Version.php +++ b/inc/inc.Version.php @@ -20,7 +20,7 @@ class SeedDMS_Version { - public $_number = "5.1.13"; + public $_number = "5.1.14"; private $_string = "SeedDMS"; function __construct() { From 833ff8f7dac1f5f5d953eef08dc86034f7b42752 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 20 Nov 2019 17:50:26 +0100 Subject: [PATCH 2/3] do not allow adding events and showing tasks --- views/bootstrap/class.Bootstrap.php | 2 +- views/bootstrap/class.Calendar.php | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index 478fecb97..021f6f69d 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -334,7 +334,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);; echo " \n"; echo " \n"; - if($this->params['enablemenutasks']) { + if($this->params['enablemenutasks'] && !$this->params['user']->isGuest()) { echo "
"; echo "
"; // echo "
    \n"; diff --git a/views/bootstrap/class.Calendar.php b/views/bootstrap/class.Calendar.php index 8e49920b6..381a904f7 100644 --- a/views/bootstrap/class.Calendar.php +++ b/views/bootstrap/class.Calendar.php @@ -224,6 +224,8 @@ class SeedDMS_View_Calendar extends SeedDMS_Bootstrap_Style { } /* }}} */ function js() { /* {{{ */ + $dms = $this->params['dms']; + $user = $this->params['user']; $strictformcheck = $this->params['strictformcheck']; header('Content-Type: application/javascript'); ?> @@ -232,6 +234,7 @@ class SeedDMS_View_Calendar extends SeedDMS_Bootstrap_Style { $('#calendar').fullCalendar({ height: $(window).height()-210, locale: 'params['session']->getLanguage(), 0, 2); ?>', +isGuest()) { ?> customButtons: { addEventButton: { text: '', @@ -241,6 +244,7 @@ class SeedDMS_View_Calendar extends SeedDMS_Bootstrap_Style { } } }, + header: { left: 'prev,next today addEventButton', center: 'title', From 154c3c2118b701a327c869802fcac9efa2583d3c Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 20 Nov 2019 19:22:23 +0100 Subject: [PATCH 3/3] set 'onepage' in factory --- inc/inc.ClassUI.php | 1 + 1 file changed, 1 insertion(+) diff --git a/inc/inc.ClassUI.php b/inc/inc.ClassUI.php index c4ab1dd90..d22e1ec07 100644 --- a/inc/inc.ClassUI.php +++ b/inc/inc.ClassUI.php @@ -136,6 +136,7 @@ class UI extends UI_Default { $view->setParam('showmissingtranslations', $settings->_showMissingTranslations); $view->setParam('defaultsearchmethod', $settings->_defaultSearchMethod); $view->setParam('cachedir', $settings->_cacheDir); + $view->setParam('onepage', $settings->_onePageMode); foreach($decorators as $extname=>$decorator) { $filename = $settings->_rootDir.'ext/'.$extname.'/decorators/'.$theme."/".$decorator['file']; require($filename);