Skip to content

Commit

Permalink
other changes from review
Browse files Browse the repository at this point in the history
  • Loading branch information
cconard96 committed Apr 29, 2024
1 parent 97a1b12 commit 2eff94d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Expand Up @@ -291,6 +291,7 @@ The present file will list all changes made to the project; according to the
- `Search::outputData()`
- `Search::sylk_clean()`
- `SLM::setTicketCalendar()`
- `SoftwareLicense::getSonsOf()`
- `Toolbox::canUseCas()`
- `Toolbox::checkValidReferer()`
- `Toolbox::clean_cross_side_scripting_deep()`
Expand Down
6 changes: 5 additions & 1 deletion src/Software.php
Expand Up @@ -980,7 +980,11 @@ public function merge($item, $html = true)
if ($html) {
$twig_params = [
'merge_msg' => __('Merging'),
'progress' => Html::createProgressBar(__('Work in progress...'), ['display' => false])
'progress' => Html::progressBar('doaction_progress', [
'message' =>__('Work in progress...'),
'create' => true,
'display' => false
])
];
// language=Twig
echo TemplateRenderer::getInstance()->renderFromStringTemplate(<<<TWIG
Expand Down

0 comments on commit 2eff94d

Please sign in to comment.