X Tutup
Skip to content

Display each app only once in app:list --minimal #40081

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
phil-davis merged 1 commit into from
May 19, 2022
Merged

Display each app only once in app:list --minimal #40081

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions changelog/unreleased/39930
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Bugfix: List apps only once

`occ app:list --minimal`
could display apps twice in the listing. Each app is now displayed only once.

https://github.com/owncloud/core/issues/39930
https://github.com/owncloud/core/pull/40081
12 changes: 10 additions & 2 deletions core/Command/App/ListApps.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ protected function execute(InputInterface $input, OutputInterface $output) {
$appDetailRecord = [];

if ($minimalView) {
$apps['enabled'][] = sprintf('%s%s', $app, isset($versions[$app]) ? ' '.$versions[$app] : '');
$apps['enabled'][$app] = sprintf('%s%s', $app, isset($versions[$app]) ? ' '.$versions[$app] : '');
continue;
}

Expand All @@ -141,7 +141,7 @@ protected function execute(InputInterface $input, OutputInterface $output) {
$appDetailRecord = [];

if ($minimalView) {
$apps['disabled'][] = sprintf('%s%s', $app, isset($versions[$app]) ? ' '.$versions[$app] : '');
$apps['disabled'][$app] = sprintf('%s%s', $app, isset($versions[$app]) ? ' '.$versions[$app] : '');
continue;
}

Expand All @@ -154,6 +154,14 @@ protected function execute(InputInterface $input, OutputInterface $output) {
}
}

if ($minimalView) {
// For minimal view we do not want writeArrayInOutputFormat to write a key-value format
// The app name and version are already formatted in the string that is the array value.
// So just keep the array values.
$apps['enabled'] = \array_values($apps['enabled']);
$apps['disabled'] = \array_values($apps['disabled']);
}

$this->writeAppList($input, $output, $apps);
return 0;
}
Expand Down
X Tutup