8000 Fil 190: Adding Generic Foreign Key to Placeholder model by anirbanlahiri-fidelity · Pull Request #6452 · django-cms/django-cms · GitHub
[go: up one dir, main page]
Skip to content

Fil 190: Adding Generic Foreign Key to Placeholder model #6452

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.

Sign up for GitHub

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 15 commits into from
Jul 25, 2018
Merged

Fil 190: Adding Generic Foreign Key to Placeholder model #6452

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
67cd0fe
FIL-190: Added Generic Foreign Key to Placeholder model
Jul 20, 2018
3f7207e
FIL-190: Code tidy-up
Jul 20, 2018
2541368
190 - renamed the generid foreign key as source
Jul 20, 2018
52999e2
190 - cosmetic space removal
Jul 20, 2018
708752c
190 - cosmetic line length
Jul 20, 2018
ecf9b5a
190 - Fixed all the migration errors and taken into account review co…
Jul 24, 2018
4de0df4
190 - renamed and moved the migration files
Jul 24, 2018
1e506e4
190 - sorting the order of imports
Jul 24, 2018
54719b4
190 - removing spaces
Jul 24, 2018
7e38c5b
190: linearized migration dependencies
Jul 24, 2018
a7a6d7f
190: minor change in formatting
Jul 24, 2018
4cf76f9
190: minor change in formatting
Jul 24, 2018
e3dc9e5
cosmetics
czpython Jul 24, 2018
92f6eb6
reinstating the dependency to contenttypes
Jul 25, 2018
99ffbac
Merge branch 'fil-190' of https://github.com/FidelityInternational/dj…
Jul 25, 2018
8000 File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
190 - sorting the order of imports
  • Loading branch information
Anirban Lahiri committed Jul 24, 2018
commit 1e506e4b9a7435518e79207fee42c65bcce61b30
2 changes: 1 addition & 1 deletion cms/models/placeholdermodel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
from datetime import datetime, timedelta

from django.contrib import admin
from django.contrib.contenttypes.models import ContentType
from django.contrib.contenttypes.fields import GenericForeignKey
from django.contrib.contenttypes.models import ContentType
from django.db import models
from django.template.defaultfilters import title
from django.utils import six
Expand Down
0