gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2026-02-21 01:58:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2026-02-03 21:52:12 +01:00
commit b6377ceda1
5 changed files with 50 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -378,6 +378,7 @@
if length is greater than 8
- parse changelog and readme of extension as markdown
- fix incorrect base path for url routing, which broke some extensions
- migrate extension after enabling it with console tool
--------------------------------------------------------------------------------
Changes in version 5.1.44

1
inc/inc.ConversionInit.php
View File

@ -77,6 +77,7 @@ $conversionmgr->addService(new SeedDMS_ConversionServiceImageToText('image/jpg',
$conversionmgr->addService(new SeedDMS_ConversionServiceTextToText('text/plain', 'text/plain'))->setLogger($logger);
$conversionmgr->addService(new SeedDMS_ConversionServiceTextToText('text/markdown', 'text/plain'))->setLogger($logger);
$conversionmgr->addService(new SeedDMS_ConversionServiceTextToText('text/x-rst', 'text/plain'))->setLogger($logger);
$conversionmgr->addService(new SeedDMS_ConversionServiceTextToText('text/x-csrc', 'text/plain'))->setLogger($logger);
$conversionmgr->addService(new SeedDMS_ConversionServiceHtmlToText('text/html', 'text/plain'))->setLogger($logger);

15
utils/Commands/ConfigureextensionCommand.php
View File

@ -66,6 +66,8 @@ class ConfigureextensionCommand extends Command
return Command::FAILURE;
}
require_once('inc/inc.DBInit.php');
if ($input->getOption('enable')) {
if ($settings->extensionIsDisabled($extname)) {
$settings->enableExtension($extname);
@ -73,7 +75,18 @@ class ConfigureextensionCommand extends Command
$output->writeln(sprintf("<error>Could not write configuration.</error>", $extname));
return Command::FAILURE;
} else {
$output->writeln(sprintf("Extension is %s.", $settings->extensionIsDisabled($extname) ? 'disabled' : 'enabled'));
$ret = $extmgr->migrate($extname, $settings, $dms, $logger);
if($ret !== null) {
if($ret === true) {
$output->writeln(sprintf("Migration of extension successful"));
$output->writeln(sprintf("Extension is %s.", $settings->extensionIsDisabled($extname) ? 'disabled' : 'enabled'));
} else {
$output->writeln(sprintf("<error>Migration of extension failed</error>"));
return Command::FAILURE;
}
} else {
$output->writeln(sprintf("Extension is %s.", $settings->extensionIsDisabled($extname) ? 'disabled' : 'enabled'));
}
}
} else {
$output->writeln(sprintf("Extension already enabled."));

17
views/bootstrap/class.Bootstrap.php
View File

@ -495,6 +495,23 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
echo " </ul>\n";
/* }}} End of user profile menu */
/* Status icons {{{ */
$menuitems = [];
if($this->hasHook('globalNavigationStatusBar'))
$menuitems = $this->callHook('globalNavigationStatusBar', $menuitems);
if ($menuitems) {
echo " <ul class=\"nav pull-right\">\n";
foreach($menuitems as $menuitem) {
if (is_string($menuitem)) {
echo "<li class=\"nav-item\">".$menuitem."</li>";
} else {
echo "<li class=\"nav-item\"><a class=\"nav-link\" href=\"".$menuitem['link']."\"".(isset($menuitem['target']) ? ' target="'.$menuitem['target'].'"' : '').">".$menuitem['label']."</a></li>";
}
}
echo " </ul>\n";
}
/* }}} Εnd of status icons */
/* menu tasks {{{ */
if($this->params['enablemenutasks']) {
if($accessobject->check_view_access('Tasks', array('action'=>'menuTasks'))) {

17
views/bootstrap4/class.Bootstrap4.php
View File

@ -441,6 +441,23 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
}
/* }}} End of clipboard */
/* Status icons {{{ */
$menuitems = [];
if($this->hasHook('globalNavigationStatusBar'))
$menuitems = $this->callHook('globalNavigationStatusBar', $menuitems);
if ($menuitems) {
echo " <ul class=\"navbar-nav ml-auto\">\n";
foreach($menuitems as $menuitem) {
if (is_string($menuitem)) {
echo "<li class=\"nav-item\">".$menuitem."</li>";
} else {
echo "<li class=\"nav-item\"><a class=\"nav-link\" href=\"".$menuitem['link']."\"".(isset($menuitem['target']) ? ' target="'.$menuitem['target'].'"' : '').">".$menuitem['label']."</a></li>";
}
}
echo " </ul>\n";
}
/* }}} Εnd of status icons */
/* user profile menu {{{ */
echo " <ul class=\"navbar-nav ml-auto\">\n";
echo " <li class=\"nav-item dropdown\">\n";