-
-
Notifications
You must be signed in to change notification settings - Fork 3.2k
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.
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
czpython
merged 15 commits into
django-cms:release/4.0.x
from
FidelityInternational:fil-190
Jul 25, 2018
Merged
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
3f7207e
FIL-190: Code tidy-up
2541368
190 - renamed the generid foreign key as source
52999e2
190 - cosmetic space removal
708752c
190 - cosmetic line length
ecf9b5a
190 - Fixed all the migration errors and taken into account review co…
4de0df4
190 - renamed and moved the migration files
1e506e4
190 - sorting the order of imports
54719b4
190 - removing spaces
7e38c5b
190: linearized migration dependencies
a7a6d7f
190: minor change in formatting
4cf76f9
190: minor change in formatting
e3dc9e5
cosmetics
czpython 92f6eb6
reinstating the dependency to contenttypes
99ffbac
Merge branch 'fil-190' of https://github.com/FidelityInternational/dj…
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
Next
Next commit
FIL-190: Added Generic Foreign Key to Placeholder model
- Loading branch information
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
# -*- coding: utf-8 -*- | ||
# Generated by Django 1.11.14 on 2018-07-19 16:38 | ||
from __future__ import unicode_literals | ||
|
||
from django.db import migrations, models | ||
import django.db.models.deletion | ||
|
||
|
||
class Migration(migrations.Migration): | ||
|
||
dependencies = [ | ||
('contenttypes', '0002_remove_content_type_name'), | ||
('cms', '0021_auto_20180507_1432'), | ||
] | ||
|
||
operations = [ | ||
migrations.AddField( | ||
model_name='placeholder', | ||
name='content_type', | ||
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='contenttypes.ContentType'), | ||
), | ||
migrations.AddField( | ||
model_name='placeholder', | ||
name='object_id', | ||
field=models.PositiveIntegerField(blank=True, null=True), | ||
), | ||
] |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Use 0023 instead of 22 and move the others (>=0023) one number up