diff --git a/inc/inc.ClassViewCommon.php b/inc/inc.ClassViewCommon.php index 482a4e038..9636c936c 100644 --- a/inc/inc.ClassViewCommon.php +++ b/inc/inc.ClassViewCommon.php @@ -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 ''; diff --git a/utils/Commands/ConfigureextensionCommand.php b/utils/Commands/ConfigureextensionCommand.php index 388f8754d..73f821d6d 100644 --- a/utils/Commands/ConfigureextensionCommand.php +++ b/utils/Commands/ConfigureextensionCommand.php @@ -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("Migration of extension failed")); + return Command::FAILURE; + } + } } else { $output->writeln(sprintf("Extension is %s.", $settings->extensionIsDisabled($extname) ? 'disabled' : 'enabled')); } diff --git a/utils/Commands/UpdateextensionCommand.php b/utils/Commands/UpdateextensionCommand.php index 2fbf2131a..ac9aab203 100644 --- a/utils/Commands/UpdateextensionCommand.php +++ b/utils/Commands/UpdateextensionCommand.php @@ -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) ; diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php index e8f63cc81..2fc4b41a0 100644 --- a/views/bootstrap/class.Search.php +++ b/views/bootstrap/class.Search.php @@ -1699,6 +1699,10 @@ $(document).ready(function() { } } } + $txt = $this->callHook('postBatchOperations'); + if(is_string($txt)) { + echo $txt; + } // }}} ?>