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.

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

Issue 25 attribution change #48

Draft
wants to merge 24 commits into
base: refactor
Choose a base branch
from
Draft
Changes from 1 commit
Commits
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
Migration update
Removed unneeded period.
brandon.rosenbloom committed Jun 8, 2021
commit 74b6c5cee653639bc0a4d8b985a602169b125bf8
Original file line number Diff line number Diff line change
@@ -94,7 +94,7 @@ def load_resource_use_types(apps, schema_editor):
ResourceUseType.objects.get_or_create(pk=3, name='Free Resource',
description='Free Resource - Free to use', active=True)
ResourceUseType.objects.get_or_create(pk=4, name='Freemium',
description='Freemium - significant portion of resource free to use.', active=True)
description='Freemium - significant portion of resource free to use', active=True)
ResourceUseType.objects.get_or_create(pk=5, name='Paid',
description='Paid - costs money to access this resource', active=True)

19 changes: 19 additions & 0 deletions python-in-edu/resources/migrations/0015_auto_20210608_2119.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Generated by Django 3.1.6 on 2021-06-08 21:19

from django.db import migrations, models
import django.db.models.deletion


class Migration(migrations.Migration):

dependencies = [
('resources', '0014_auto_20210607_1959'),
]

operations = [
migrations.AlterField(
model_name='resource',
name='status',
field=models.ForeignKey(blank=True, default=1, null=True, on_delete=django.db.models.deletion.PROTECT, to='resources.resourcestatus'),
),
]
4 changes: 2 additions & 2 deletions python-in-edu/resources/models.py
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ def get_initial_status():
initial_status = ResourceStatus.objects.get(sequence=1).id
if initial_status:
return initial_status

return None

# Profile Models
@@ -159,7 +159,7 @@ class Resource(models.Model):
# core fields
title = models.CharField(max_length=200, help_text="What is the name of the resource")
submitter = models.ForeignKey(User, on_delete=models.DO_NOTHING)
status = models.ForeignKey(ResourceStatus, on_delete=models.PROTECT, default=get_initial_status())
status = models.ForeignKey(ResourceStatus, on_delete=models.PROTECT, default=get_initial_status(), blank=True, null=True)

# required fields
requires_signup = models.ForeignKey(SignupChoice, on_delete=models.PROTECT, help_text="Are users required to create an account or provide their email address to access this resource?")