Skip to content
Snippets Groups Projects
Commit 61ba6f37 authored by fu2662cw's avatar fu2662cw :speech_balloon:
Browse files

Merge branch '38-update-master-branch-to-include-new-linting-rules' into 'master'

Resolve "Update Master Branch to include new Linting Rules"

Closes #38

See merge request swp-unisport/team-warumkeinrust/unisport-o-mat!36
parents 516e5a84 5f33f733
No related branches found
No related tags found
No related merge requests found
git ls-files | grep -v 'migrations\|manage.py\|course_scraper' | grep -E '.py$' | xargs pylint --load-plugins=pylint_django git ls-files | grep -v 'migrations\|manage.py\|course_scraper\|tests.py' | grep -E '.py$' | xargs pylint --load-plugins=pylint_django
\ No newline at end of file \ No newline at end of file
...@@ -7,13 +7,17 @@ import django.db.models.deletion ...@@ -7,13 +7,17 @@ import django.db.models.deletion
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('quiz', '0002_auto_20210525_1514'), ("quiz", "0002_auto_20210525_1514"),
] ]
operations = [ operations = [
migrations.AddField( migrations.AddField(
model_name='criterion', model_name="criterion",
name='question', name="question",
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='quiz.question'), field=models.ForeignKey(
null=True,
on_delete=django.db.models.deletion.SET_NULL,
to="quiz.question",
),
), ),
] ]
...@@ -7,22 +7,28 @@ import django.db.models.deletion ...@@ -7,22 +7,28 @@ import django.db.models.deletion
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('quiz', '0003_criterion_question'), ("quiz", "0003_criterion_question"),
] ]
operations = [ operations = [
migrations.RemoveField( migrations.RemoveField(
model_name='criterion', model_name="criterion",
name='question', name="question",
), ),
migrations.RemoveField( migrations.RemoveField(
model_name='question', model_name="question",
name='id', name="id",
), ),
migrations.AddField( migrations.AddField(
model_name='question', model_name="question",
name='criterion', name="criterion",
field=models.OneToOneField(default=None, on_delete=django.db.models.deletion.CASCADE, primary_key=True, serialize=False, to='quiz.criterion'), field=models.OneToOneField(
default=None,
on_delete=django.db.models.deletion.CASCADE,
primary_key=True,
serialize=False,
to="quiz.criterion",
),
preserve_default=False, preserve_default=False,
), ),
] ]
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment