Skip to content
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.

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

Only show weather credits if necessary #39527

Merged
merged 2 commits into from Jul 21, 2023

Conversation

julien-nc
Copy link
Member

closes #39526

As the credits are hardcoded in the dashboard app, they were not hidden if the weather status is disabled.

isStatusActive('weather') returns true even if the weather status app is disabled just because the status was previously enabled. That's why we need to check if the status is registered and if it's enabled.

…s is enabled

Signed-off-by: Julien Veyssier <julien-nc@posteo.net>
@julien-nc julien-nc added this to the Nextcloud 28 milestone Jul 21, 2023
@julien-nc julien-nc requested review from blizzz, juliushaertl, a team, susnux, Pytal and szaimen and removed request for a team July 21, 2023 11:44
Copy link
Contributor

@szaimen szaimen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM but didnt test

@julien-nc julien-nc enabled auto-merge July 21, 2023 15:29
@julien-nc julien-nc merged commit d255b89 into master Jul 21, 2023
38 checks passed
@julien-nc julien-nc deleted the fix/39526/dashboard-hide-weather-credits branch July 21, 2023 16:29
@blizzz
Copy link
Member

blizzz commented Jul 26, 2023

/backport to stable27

@blizzz
Copy link
Member

blizzz commented Jul 26, 2023

/backport to stable26

@backportbot-nextcloud
Copy link

The backport to stable27 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable27
git pull origin stable27

# Create the new backport branch
git checkout -b fix/foo-stable27

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable27

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

@backportbot-nextcloud
Copy link

The backport to stable26 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable26
git pull origin stable26

# Create the new backport branch
git checkout -b fix/foo-stable26

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable26

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Bug]: Weather service information shown despite weather status being disabled
3 participants