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

[Fixes #12627] Include assets inside B/R #12628

Merged
merged 11 commits into from
Oct 7, 2024
Merged

[Fixes #12627] Include assets inside B/R #12628

merged 11 commits into from
Oct 7, 2024

Conversation

mattiagiupponi
Copy link
Contributor

  • Add assets folder to the backup
  • Add Asset foolder to restore
  • During the restore the asset path is replaced with the new ASSETS_ROOT if needed
  • Now the asset works with a custom Manager named AssetPolymorphicManager which is required to correctly handle the dump during the backup procedure. There is an hack in the polymorphic model, but works only if the dump is called via CLI
  • align test and code to the new changes

Checklist

Reviewing is a process done by project maintainers, mostly on a volunteer basis. We try to keep the overhead as small as possible and appreciate if you help us to do so by completing the following items. Feel free to ask in a comment if you have troubles with any of them.

For all pull requests:

  • Confirm you have read the contribution guidelines
  • You have sent a Contribution Licence Agreement (CLA) as necessary (not required for small changes, e.g., fixing typos in the documentation)
  • Make sure the first PR targets the master branch, eventual backports will be managed later. This can be ignored if the PR is fixing an issue that only happens in a specific branch, but not in newer ones.

The following are required only for core and extension modules (they are welcomed, but not required, for contrib modules):

  • There is a ticket in https://github.com/GeoNode/geonode/issues describing the issue/improvement/feature (a notable exemption is, changes not visible to end-users)
  • The issue connected to the PR must have Labels and Milestone assigned
  • PR for bug fixes and small new features are presented as a single commit
  • Commit message must be in the form "[Fixes #<issue_number>] Title of the Issue"
  • PR title must be in the form "[Fixes #<issue_number>] Title of the PR"
  • New unit tests have been added covering the changes, unless there is an explanation on why the tests are not necessary/implemented
  • This PR passes all existing unit tests (test results will be reported by travis-ci after opening this PR)
  • This PR passes the QA checks: black geonode && flake8 geonode
  • Commits changing the settings, UI, existing user workflows, or adding new functionality, need to include documentation updates
  • Commits adding new texts do use gettext and have updated .po / .mo files (without location infos)

Submitting the PR does not require you to check all items, but by the time it gets merged, they should be either satisfied or inapplicable.

@cla-bot cla-bot bot added the cla-signed CLA Bot: community license agreement signed label Oct 4, 2024
@mattiagiupponi mattiagiupponi self-assigned this Oct 4, 2024
@mattiagiupponi mattiagiupponi linked an issue Oct 4, 2024 that may be closed by this pull request
geonode/assets/local.py Show resolved Hide resolved
geonode/assets/local.py Show resolved Hide resolved
geonode/assets/utils.py Outdated Show resolved Hide resolved
Copy link

codecov bot commented Oct 4, 2024

Codecov Report

Attention: Patch coverage is 44.44444% with 35 lines in your changes missing coverage. Please review.

Project coverage is 64.16%. Comparing base (30b84a2) to head (67780f6).
Report is 1 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff             @@
##           master   #12628      +/-   ##
==========================================
- Coverage   64.17%   64.16%   -0.02%     
==========================================
  Files         889      889              
  Lines       53717    53756      +39     
  Branches     6627     6631       +4     
==========================================
+ Hits        34473    34492      +19     
- Misses      17730    17748      +18     
- Partials     1514     1516       +2     

geonode/br/management/commands/restore.py Outdated Show resolved Hide resolved
@giohappy giohappy added this to the 4.4.0 milestone Oct 7, 2024
@mattiagiupponi mattiagiupponi merged commit 33be915 into master Oct 7, 2024
14 of 16 checks passed
@mattiagiupponi mattiagiupponi deleted the ISSUE_12627 branch October 7, 2024 09:24
github-actions bot pushed a commit that referenced this pull request Oct 7, 2024
* [Fixes #12627] Include assets inside B/R
* [Fixes #12627] force localasset in get_link_url
* [Fixes #12627] fix pr comments
* [Fixes #12627] add todo for assets_root replace
* [Fixes #12627] change utils assets_root name

(cherry picked from commit 33be915)
mattiagiupponi added a commit that referenced this pull request Oct 7, 2024
* [Fixes #12627] Include assets inside B/R
* [Fixes #12627] force localasset in get_link_url
* [Fixes #12627] fix pr comments
* [Fixes #12627] add todo for assets_root replace
* [Fixes #12627] change utils assets_root name

(cherry picked from commit 33be915)

Co-authored-by: mattiagiupponi <51856725+mattiagiupponi@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 4.4.x cla-signed CLA Bot: community license agreement signed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Include assets inside B/R
3 participants