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.

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

Fix python3 migration issue #1287 #1371

Merged
merged 3 commits into from
Jul 16, 2019
Merged

Fix python3 migration issue #1287 #1371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3850bad
Fix migration issue with python2/3 migration
alles-klar Jul 12, 2019
ac5dc88
remove spaces
alles-klar Jul 12, 2019
932c1e8
flake8 conformal
alles-klar Jul 12, 2019
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
2 changes: 1 addition & 1 deletion dojo/db_migrations/0001_initial.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -722,7 +722,7 @@ class Migration(migrations.Migration):
('enable_product_grade', models.BooleanField(default=False, help_text='Displays a grade letter next to a product to show the overall health.', verbose_name='Enable Product Grading')),
('product_grade', models.CharField(blank=True, max_length=800)),
('product_grade_a', models.IntegerField(default=90, help_text=b"Percentage score for an 'A' >=", verbose_name='Grade A')),
('product_grade_', models.IntegerField(default=80, help_text=b"Percentage score for a '' >=", verbose_name='Grade ')),
('product_grade_b', models.IntegerField(default=80, help_text=b"Percentage score for a '' >=", verbose_name='Grade ')),
('product_grade_c', models.IntegerField(default=70, help_text=b"Percentage score for a 'C' >=", verbose_name='Grade C')),
('product_grade_d', models.IntegerField(default=60, help_text=b"Percentage score for a 'D' >=", verbose_name='Grade D')),
('product_grade_f', models.IntegerField(default=59, help_text=b"Percentage score for an 'F' <=", verbose_name='Grade F')),
Expand Down
14 changes: 5 additions & 9 deletions dojo/db_migrations/0006_django2_upgrade.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,6 @@ class Migration(migrations.Migration):
]

operations = [
migrations.RemoveField(
model_name='system_settings',
name='product_grade_',
),
migrations.AddField(
model_name='system_settings',
name='product_grade_b',
field=models.IntegerField(default=80, help_text="Percentage score for a 'B' >=", verbose_name='Grade B'),
),
migrations.AlterField(
model_name='child_rule',
name='match_field',
Expand Down Expand Up @@ -167,6 +158,11 @@ class Migration(migrations.Migration):
name='product_grade_a',
field=models.IntegerField(default=90, help_text="Percentage score for an 'A' >=", verbose_name='Grade A'),
),
migrations.AlterField(
model_name='system_settings',
name='product_grade_b',
field=models.IntegerField(default=80, help_text="Percentage score for a 'B' >=", verbose_name='Grade B'),
),
migrations.AlterField(
model_name='system_settings',
name='product_grade_c',
Expand Down