gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2026-05-08 13:31:24 +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-03-16 22:02:11 +01:00
commit c6f4bb0b2c
4 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
inc/inc.ClassViewCommon.php
View File

@ -320,7 +320,7 @@ class SeedDMS_View_Common {
* @param array $urlparams list of url parameters
* @return string $url
*/
protected function html_url($view, $urlparams=array()) { /* {{{ */
public function html_url($view, $urlparams=array()) { /* {{{ */
$url = $this->params['settings']->_httpRoot."out/out.".$view.".php";
if(is_array($urlparams))
$url .= "?".http_build_query($urlparams);
@ -341,7 +341,7 @@ class SeedDMS_View_Common {
* @param boolean $hsc set to false if htmlspecialchars() shall not be called
* @return string link
*/
protected function html_link($view, $urlparams, $linkparams, $link, $hsc=true, $nocheck=false, $wrap=array()) { /* {{{ */
public function html_link($view, $urlparams, $linkparams, $link, $hsc=true, $nocheck=false, $wrap=array()) { /* {{{ */
if(!$nocheck)
if(!$this->check_view_access($view))
return '';

12
utils/Commands/ConfigureextensionCommand.php
View File

@ -43,6 +43,7 @@ class ConfigureextensionCommand extends Command
->addOption('name', '', InputOption::VALUE_REQUIRED, 'Name of extension.', null)
->addOption('enable', '', InputOption::VALUE_NONE, 'Enable extension.')
->addOption('disable', '', InputOption::VALUE_NONE, 'Disable extension.')
->addOption('migrate', '', InputOption::VALUE_NONE, 'Migrate extension.')
;
}
@ -103,6 +104,17 @@ class ConfigureextensionCommand extends Command
} else {
$output->writeln(sprintf("Extension already disabled."));
}
} elseif ($input->getOption('migrate')) {
$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'));
}

2
utils/Commands/UpdateextensionCommand.php
View File

@ -40,7 +40,7 @@ class UpdateextensionCommand extends Command
protected function configure()
{
$this->setName('ext:update')
->setDescription('Check for extension upates')
->setDescription('Check for extension updates')
->setHelp('Retrieves the list of extensions from the repository and offers to either update or install those extension, which met the dependencies. If --url is not set, the repository url from the SeedDMS configuraton is used.')
->addOption('url', '', InputOption::VALUE_REQUIRED, 'Url of repository.', null)
;

4
views/bootstrap/class.Search.php
View File

@ -1699,6 +1699,10 @@ $(document).ready(function() {
}
}
}
$txt = $this->callHook('postBatchOperations');
if(is_string($txt)) {
echo $txt;
}
// }}}
?>