-
Notifications
You must be signed in to change notification settings - Fork 151
Multisite navs #408
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
Merged
Merged
Multisite navs #408
Changes from 11 commits
Commits
Show all changes
55 commits
Select commit
Hold shift + click to select a range
0ff16b4
added navbar chooser to settings, need to fix frontend - WIP
a010fef
Added navbar and footer choosers to layout settings, adjusted get_nav…
6605713
fixed flake8 flagged error regarding model import
d99e3bb
un-abstracted model references - removed quote marks
9f1337c
WIP - undid new migrations, commented out broken code for now
c834519
Got settings for navbar and footer choosers working but WIP on get_na…
c944acc
WIP - code not working yet
88d3287
WIP - notes to self
081f21f
Tried different ways to hook up the models but ththe one I have works…
c7ce69a
fixed orderables for nav and footer, added loop to pull in each nav/f…
f788ec3
fixed flake8 errors
927bd1b
WIP - data migration
7ccd990
WIP
89db602
This works to apply current navbar and current footer to layout setti…
beac3a5
removed comm3nts
cc1c6f2
WIP using all()
4ed6601
Fixed data migration to run for sites that already have navbar/footer…
9378434
fixing flake8 errors
d616bc1
fixed reference error in tags, started unit tests for new feature
6a60b65
fixing errors
9a60252
migration test cases WIP
c24ca5a
WIP tests
7509f96
added navbar chooser to settings, need to fix frontend - WIP
69d8851
Added navbar and footer choosers to layout settings, adjusted get_nav…
5e0990d
fixed flake8 flagged error regarding model import
d1048e7
un-abstracted model references - removed quote marks
3bc321b
WIP - undid new migrations, commented out broken code for now
28ab86d
Got settings for navbar and footer choosers working but WIP on get_na…
31b93f7
WIP - code not working yet
e690cf3
WIP - notes to self
a68c3d3
Tried different ways to hook up the models but ththe one I have works…
405a651
fixed orderables for nav and footer, added loop to pull in each nav/f…
393ceaf
fixed flake8 errors
3a17a92
WIP - data migration
2108c30
WIP
b79a0a6
This works to apply current navbar and current footer to layout setti…
919d597
removed comm3nts
b9fd29f
WIP using all()
7839f2b
Fixed data migration to run for sites that already have navbar/footer…
0cfafca
fixing flake8 errors
6732548
fixed reference error in tags, started unit tests for new feature
9433eca
fixing errors
fea88b0
migration test cases WIP
d906a1c
WIP tests
2acc60a
updating repo
3591e22
merging in dev branch changes
d2bc2b1
restored imports in wagtail settings models, wip on fixing unit tests
3c44397
navbar tests in progress
bf3a748
unit tests work
c00a878
check that orderables render in order
9d831a0
updated docs with new feature
761e8e2
Merge branch 'dev' into multisite-navs
vsalvino 418517c
Merge branch 'dev' into multisite-navs
vsalvino c6aabf6
Merge branch 'dev' into multisite-navs
vsalvino 2d8de1f
Update migration from recent changes in dev
vsalvino File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
41 changes: 41 additions & 0 deletions
41
coderedcms/migrations/0020_footerorderable_navbarorderable.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| # Generated by Django 3.1.7 on 2021-03-12 19:53 | ||
|
|
||
| from django.db import migrations, models | ||
| import django.db.models.deletion | ||
| import modelcluster.fields | ||
|
|
||
|
|
||
| class Migration(migrations.Migration): | ||
|
|
||
| dependencies = [ | ||
| ('coderedcms', '0019_spelling_corrections'), | ||
| ] | ||
|
|
||
| operations = [ | ||
| migrations.CreateModel( | ||
| name='NavbarOrderable', | ||
| fields=[ | ||
| ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), | ||
| ('sort_order', models.IntegerField(blank=True, editable=False, null=True)), | ||
| ('navbar', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='coderedcms.navbar')), | ||
| ('navbar_chooser', modelcluster.fields.ParentalKey(on_delete=django.db.models.deletion.CASCADE, related_name='site_navbar', to='coderedcms.layoutsettings', verbose_name='Site Navbars')), | ||
| ], | ||
| options={ | ||
| 'ordering': ['sort_order'], | ||
| 'abstract': False, | ||
| }, | ||
| ), | ||
| migrations.CreateModel( | ||
| name='FooterOrderable', | ||
| fields=[ | ||
| ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), | ||
| ('sort_order', models.IntegerField(blank=True, editable=False, null=True)), | ||
| ('footer', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='coderedcms.footer')), | ||
| ('footer_chooser', modelcluster.fields.ParentalKey(on_delete=django.db.models.deletion.CASCADE, related_name='site_footer', to='coderedcms.layoutsettings', verbose_name='Site Footers')), | ||
| ], | ||
| options={ | ||
| 'ordering': ['sort_order'], | ||
| 'abstract': False, | ||
| }, | ||
| ), | ||
| ] | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.