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

Fix sidebar navigation after erroneous page #1196

Merged
merged 3 commits into from
Sep 7, 2021

Conversation

osma
Copy link
Member

@osma osma commented Sep 7, 2021

Fixes #721
Fixes #722
Fixes #723

These fixes have been split off from PR #1033 by creating a new branch from master and cherry-picking two commits by @kouralex . Some merge conflicts were fixed.

@osma osma added the bug label Sep 7, 2021
@osma osma added this to the 2.12 milestone Sep 7, 2021
@osma osma self-assigned this Sep 7, 2021
@codecov
Copy link

codecov bot commented Sep 7, 2021

Codecov Report

Merging #1196 (7a20882) into master (3d05609) will decrease coverage by 0.05%.
The diff coverage is 42.85%.

Impacted file tree graph

@@             Coverage Diff              @@
##             master    #1196      +/-   ##
============================================
- Coverage     68.91%   68.86%   -0.06%     
- Complexity     1592     1594       +2     
============================================
  Files            32       32              
  Lines          3912     3918       +6     
============================================
+ Hits           2696     2698       +2     
- Misses         1216     1220       +4     
Impacted Files Coverage Δ
controller/WebController.php 16.87% <0.00%> (-0.06%) ⬇️
model/Vocabulary.php 86.85% <50.00%> (-0.96%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 3d05609...7a20882. Read the comment docs.

…ializing ajax query on vocabulary concept error page

(cherry picked from commit 583b950)
@sonarqubecloud
Copy link

sonarqubecloud bot commented Sep 7, 2021

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
0.0% 0.0% Duplication

@osma
Copy link
Member Author

osma commented Sep 7, 2021

I've tested this and it seems to solve all three issues. Merging.

@osma osma merged commit 124785e into master Sep 7, 2021
@osma osma deleted the issue721-fix-sidebar-after-broken-page branch September 7, 2021 14:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment