Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Nextcloud
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TeDomum
Nextcloud
Commits
a64681a0
Unverified
Commit
a64681a0
authored
4 years ago
by
Morris Jobke
Committed by
GitHub
4 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #19514 from sndrr/already-enabled-apps
Already enabled apps
parents
9b7e24a7
6b62bef9
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
core/Command/App/Enable.php
+4
-0
4 additions, 0 deletions
core/Command/App/Enable.php
tests/Core/Command/Apps/AppsEnableTest.php
+1
-0
1 addition, 0 deletions
tests/Core/Command/Apps/AppsEnableTest.php
with
5 additions
and
0 deletions
core/Command/App/Enable.php
+
4
−
0
View file @
a64681a0
...
@@ -105,6 +105,10 @@ class Enable extends Command implements CompletionAwareInterface {
...
@@ -105,6 +105,10 @@ class Enable extends Command implements CompletionAwareInterface {
return
$group
->
getDisplayName
();
return
$group
->
getDisplayName
();
},
$groupIds
);
},
$groupIds
);
if
(
$this
->
appManager
->
isInstalled
(
$appId
)
&&
$groupIds
===
[])
{
$output
->
writeln
(
$appId
.
' already enabled'
);
return
;
}
try
{
try
{
/** @var Installer $installer */
/** @var Installer $installer */
...
...
This diff is collapsed.
Click to expand it.
tests/Core/Command/Apps/AppsEnableTest.php
+
1
−
0
View file @
a64681a0
...
@@ -75,6 +75,7 @@ class AppsEnableTest extends TestCase {
...
@@ -75,6 +75,7 @@ class AppsEnableTest extends TestCase {
$data
=
[
$data
=
[
[[
'admin_audit'
],
null
,
0
,
'admin_audit enabled'
],
[[
'admin_audit'
],
null
,
0
,
'admin_audit enabled'
],
[[
'comments'
],
null
,
0
,
'comments enabled'
],
[[
'comments'
],
null
,
0
,
'comments enabled'
],
[[
'comments'
,
'comments'
],
null
,
0
,
"comments enabled
\n
comments already enabled"
],
[[
'invalid_app'
],
null
,
1
,
'Could not download app invalid_app'
],
[[
'invalid_app'
],
null
,
1
,
'Could not download app invalid_app'
],
[[
'admin_audit'
,
'comments'
],
null
,
0
,
"admin_audit enabled
\n
comments enabled"
],
[[
'admin_audit'
,
'comments'
],
null
,
0
,
"admin_audit enabled
\n
comments enabled"
],
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment