Skip to content

Implemented addition of students on admin #460

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
renzon merged 1 commit into from
Jun 12, 2018
Merged

Implemented addition of students on admin #460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 10 additions & 2 deletions pythonpro/cohorts/admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,14 @@ class ClassInline(admin.TabularInline):
ordering = ('start',)


class StudentInline(admin.TabularInline):
readonly_fields = ('added',)
extra = 1
autocomplete_fields = ['user']
model = Cohort.students.through
ordering = ('added',)


class WebinarInline(admin.StackedInline):
extra = 1
model = Webinar
Expand All @@ -18,8 +26,8 @@ class WebinarInline(admin.StackedInline):


@admin.register(Cohort)
class ModuleAdmin(admin.ModelAdmin):
inlines = [ClassInline, WebinarInline]
class CohortAdmin(admin.ModelAdmin):
inlines = [ClassInline, WebinarInline, StudentInline]
prepopulated_fields = {'slug': ('title',)}
list_display = 'title start end page_link'.split()
ordering = ('-start',)
Expand Down
19 changes: 19 additions & 0 deletions pythonpro/cohorts/migrations/0004_cohortstudent_added.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Generated by Django 2.0.6 on 2018-06-12 15:05

import datetime
from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('cohorts', '0003_webinar'),
]

operations = [
migrations.AddField(
model_name='cohortstudent',
name='added',
field=models.DateTimeField(default=datetime.datetime(2018, 6, 12, 0, 0)),
),
]
18 changes: 18 additions & 0 deletions pythonpro/cohorts/migrations/0005_auto_20180612_1206.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by Django 2.0.6 on 2018-06-12 15:06

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('cohorts', '0004_cohortstudent_added'),
]

operations = [
migrations.AlterField(
model_name='cohortstudent',
name='added',
field=models.DateTimeField(auto_now_add=True),
),
]
1 change: 1 addition & 0 deletions pythonpro/cohorts/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ def get_absolute_url(self):


class CohortStudent(models.Model):
added = models.DateTimeField(auto_now_add=True)
cohort = models.ForeignKey(Cohort, on_delete=models.DO_NOTHING)
user = models.ForeignKey(get_user_model(), on_delete=models.DO_NOTHING)

Expand Down