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 STATIC_ROOT not used for dashboard theme search (Fix #2683, #1702) #2816

Merged
merged 2 commits into from
Aug 25, 2023

Conversation

niol
Copy link
Contributor

@niol niol commented Aug 3, 2023

No description provided.

@deniszh
Copy link
Member

deniszh commented Aug 15, 2023

Hi @niol
Could you please rebase this on master, I fixed the tests. Thanks!

@deniszh
Copy link
Member

deniszh commented Aug 18, 2023

Hm, tests are obviously broken because of change

2023-08-18T15:21:08.0001950Z Creating test database for alias 'default'...
2023-08-18T15:21:08.1471109Z Destroying test database for alias 'default'...
2023-08-18T15:21:08.1472001Z SystemCheckError: System check identified some issues:
2023-08-18T15:21:08.1474512Z 
2023-08-18T15:21:08.1474781Z ERRORS:
2023-08-18T15:21:08.1475371Z ?: (staticfiles.E002) The STATICFILES_DIRS setting should not contain the STATIC_ROOT setting.

Not shure what is System check though...

@deniszh
Copy link
Member

deniszh commented Aug 18, 2023

Found https://stackoverflow.com/questions/68248861/staticfiles-e002-error-the-staticfiles-dirs-setting-should-not-contain-the but I'm currently AFK to properly address this. @niol , could you please check?

@deniszh
Copy link
Member

deniszh commented Aug 24, 2023

Cool, tests are passing, will merge that. (Deepsource is failing, but it's too strict, we can skip it). Thanks for your contribution!

Comment on lines +132 to +133
css_file = os.path.isfile(os.path.join(settings.STATIC_ROOT,
'css/dashboard-%s.css' % theme))

Check failure

Code scanning / CodeQL

Uncontrolled data used in path expression High

This path depends on a
user-provided value
.
@codecov-commenter
Copy link

Codecov Report

Patch coverage: 100.00% and project coverage change: -0.03% ⚠️

Comparison is base (7518942) 76.36% compared to head (f85f997) 76.33%.

❗ Your organization is not using the GitHub App Integration. As a result you may experience degraded service beginning May 15th. Please install the Github App Integration for your organization. Read more.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #2816      +/-   ##
==========================================
- Coverage   76.36%   76.33%   -0.03%     
==========================================
  Files          88       88              
  Lines        9683     9686       +3     
  Branches     2066     2067       +1     
==========================================
  Hits         7394     7394              
- Misses       2024     2026       +2     
- Partials      265      266       +1     
Files Changed Coverage Δ
webapp/graphite/dashboard/views.py 98.28% <100.00%> (-1.03%) ⬇️

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@deniszh deniszh merged commit e058266 into graphite-project:master Aug 25, 2023
6 of 7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants