From 62eb152b01dd9cf2cadbbd190b4756405d6cfc0e Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 23 Apr 2021 10:18:23 +0200 Subject: [PATCH 1/2] indicate if extension is enabled/disabled --- views/bootstrap/class.Info.php | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/views/bootstrap/class.Info.php b/views/bootstrap/class.Info.php index ffdc5f759..d115120d4 100644 --- a/views/bootstrap/class.Info.php +++ b/views/bootstrap/class.Info.php @@ -34,6 +34,7 @@ class SeedDMS_View_Info extends SeedDMS_Theme_Style { function show() { /* {{{ */ $dms = $this->params['dms']; $user = $this->params['user']; + $settings = $this->params['settings']; $version = $this->params['version']; $availversions = $this->params['availversions']; $extmgr = $this->params['extmgr']; @@ -61,15 +62,23 @@ class SeedDMS_View_Info extends SeedDMS_Theme_Style { $seedextensions = $extmgr->getExtensionConfiguration(); echo "\n"; echo "\n\n"; + echo ""; echo "\n"; echo "\n\n\n"; $dbversion = $dms->getDBVersion(); - echo "\n"; + echo "\n"; if($user->isAdmin()) { - echo "\n"; - foreach($seedextensions as $extname=>$extconf) - echo "\n"; + echo "\n"; + foreach($seedextensions as $extname=>$extconf) { + echo ""; + echo "\n"; + } } echo "\n
".getMLText("name"); echo "
".getMLText('seeddms_version')."".$version->version()."
".getMLText('seeddms_version')."".$version->version()."
".getMLText('database_schema_version')."".$dbversion['major'].".".$dbversion['minor'].".".$dbversion['subminor']."
".$extname."
".$extconf['title']."
".$extconf['version']."
".getMLText('database_schema_version')."".$dbversion['major'].".".$dbversion['minor'].".".$dbversion['subminor']."
"; + if(!$settings->extensionIsDisabled($extname)) + echo " "; + else + echo " "; + echo "".$extname."
".$extconf['title']."
".$extconf['version']."
\n"; $this->columnEnd(); From 43a280bc6df373996a91268b824b15fd27f29bee Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 26 Apr 2021 12:24:55 +0200 Subject: [PATCH 2/2] set sequence of document when moving --- op/op.Ajax.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/op/op.Ajax.php b/op/op.Ajax.php index 03431a504..1cc4188aa 100644 --- a/op/op.Ajax.php +++ b/op/op.Ajax.php @@ -319,6 +319,9 @@ switch($command) { if($folder = $dms->getFolder($_REQUEST['targetfolderid'])) { if($folder->getAccessMode($user, 'moveDocument') >= M_READWRITE) { if($mdocument->setFolder($folder)) { + if(isset($_REQUEST['sequence'])) { + $mdocument->setSequence((float) $_REQUEST['sequence']); + } header('Content-Type: application/json'); echo json_encode(array('success'=>true, 'message'=>getMLText('splash_move_document'), 'data'=>'')); add_log_line();