mirror of
https://github.com/Rushilwiz/SkoolOS.git
synced 2025-04-10 23:40:18 -04:00
teachers group
This commit is contained in:
parent
bdc8792b6c
commit
51b5b21d40
|
@ -1,3 +1,7 @@
|
|||
from django.contrib.auth.models import Group
|
||||
|
||||
g, created = Group.objects.get_or_create(name='teachers')
|
||||
|
||||
# from datetime import datetime
|
||||
#
|
||||
# f1 = DefFiles(
|
||||
|
|
|
@ -40,7 +40,6 @@ class Class(models.Model):
|
|||
|
||||
class Teacher(models.Model):
|
||||
user = models.OneToOneField(User, on_delete=models.CASCADE)
|
||||
ion_user = models.CharField(max_length=100)
|
||||
classes=models.ManyToManyField(Class, blank=True, related_name='classes')
|
||||
git=models.CharField(max_length=100, default="", blank=True)
|
||||
ion_user=models.CharField(primary_key=True, max_length=100)
|
||||
|
|
|
@ -45,8 +45,8 @@ class StudentSerializer(serializers.HyperlinkedModelSerializer):
|
|||
|
||||
class TeacherSerializer(serializers.ModelSerializer):
|
||||
# Class = ClassSerializer(many=True, read_only=True,allow_null=True)
|
||||
owner = serializers.ReadOnlyField(source='owner.username')
|
||||
#owner = serializers.ReadOnlyField(source='owner.username')
|
||||
class Meta:
|
||||
model = Teacher
|
||||
# fields = ['url','first_name', 'last_name','git','ion_user', 'email','Class','owner']
|
||||
fields = ['first_name', 'last_name','git','ion_user', 'email','Class','owner']
|
||||
fields = ['git','ion_user','classes','user']
|
||||
|
|
|
@ -8,6 +8,7 @@ from .permissions import isTeacher, IsOwnerOrReadOnly
|
|||
from django.shortcuts import render, redirect
|
||||
from rest_framework.parsers import JSONParser
|
||||
from rest_framework.response import Response
|
||||
from django.contrib.auth.models import Group
|
||||
|
||||
|
||||
class UserViewSet(viewsets.ModelViewSet):
|
||||
|
@ -23,6 +24,8 @@ class StudentViewSet(viewsets.ModelViewSet):
|
|||
queryset = Student.objects.all()
|
||||
serializer_class = StudentSerializer
|
||||
permission_Class = [permissions.IsAuthenticated, IsOwnerOrReadOnly]
|
||||
g, created = Group.objects.get_or_create(name='teachers')
|
||||
|
||||
|
||||
def perform_create(self, serializer):
|
||||
serializer.save(user=self.request.user)
|
||||
|
|
|
@ -8,6 +8,7 @@ from django.contrib import messages
|
|||
|
||||
from .models import Token
|
||||
from api.models import Student, Teacher
|
||||
from django.contrib.auth.models import Group
|
||||
|
||||
from .forms import UserCreationForm
|
||||
|
||||
|
@ -97,12 +98,15 @@ def create_account (request):
|
|||
last_name=last_name,
|
||||
password=password)
|
||||
user.save()
|
||||
|
||||
g, created = Group.objects.get_or_create(name='teachers')
|
||||
|
||||
if isStudent:
|
||||
profile = Student(user=user, git=git, grade=grade, ion_user=username)
|
||||
else:
|
||||
profile = Teacher(user=user, git=git, ion_user=usernam)
|
||||
profile = Teacher(user=user, git=git, ion_user=username)
|
||||
group = Group.objects.get(name='teachers')
|
||||
user.groups.add(group)
|
||||
|
||||
|
||||
profile.save()
|
||||
token.delete()
|
||||
|
|
Loading…
Reference in New Issue
Block a user