From 2ceb0949f1ffb00b7b638745fe59e59cf5b51e9d Mon Sep 17 00:00:00 2001 From: Matheus Lins Date: Fri, 7 Oct 2016 16:00:18 -0300 Subject: [PATCH] updated dependent files #140 --- courses/admin.py | 2 +- courses/forms.py | 16 ++++++++-------- courses/models.py | 2 +- courses/views.py | 24 ++++++++++++------------ 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/courses/admin.py b/courses/admin.py index 51e8b60..e5e1b46 100644 --- a/courses/admin.py +++ b/courses/admin.py @@ -1,6 +1,6 @@ from django.contrib import admin -from .models import Category, Course, Subject,Topic, Activity, Material +from .models import CourseCategory, Course, Subject,Topic, Activity, Material class CategoryAdmin(admin.ModelAdmin): list_display = ['name', 'slug'] diff --git a/courses/forms.py b/courses/forms.py index e5b780b..35f3caf 100644 --- a/courses/forms.py +++ b/courses/forms.py @@ -1,19 +1,19 @@ from django import forms from django.utils.translation import ugettext_lazy as _ -from .models import Category, Course, Subject, Topic, ActivityFile, Activity +from .models import CourseCategory, Course, Subject, Topic, ActivityFile, Activity from s3direct.widgets import S3DirectWidget -class CategoryForm(forms.ModelForm): +class CategoryCourseForm(forms.ModelForm): class Meta: - model = Category + model = CourseCategory fields = ('name',) labels = { 'name': _('Name') } help_texts = { - 'name': _('Category name') + 'name': _('CourseCategory name') } @@ -62,7 +62,7 @@ class CourseForm(forms.ModelForm): 'init_date': _('Course start date'), 'end_date': _('Course end date'), 'image': _('Image'), - 'category': _('Category'), + 'category': _('CourseCategory'), } help_texts = { 'name': _('Course name'), @@ -74,7 +74,7 @@ class CourseForm(forms.ModelForm): 'init_date': _('Date that the course starts (dd/mm/yyyy)'), 'end_date': _('Date that the course ends (dd/mm/yyyy)'), 'image': _('Representative image of the course'), - 'category': _('Category which the course belongs'), + 'category': _('CourseCategory which the course belongs'), } widgets = { @@ -102,7 +102,7 @@ class UpdateCourseForm(CourseForm): 'init_date': _('Course start date'), 'end_date': _('Course end date'), 'image': _('Image'), - 'category': _('Category'), + 'category': _('CourseCategory'), 'students': _('Student'), } help_texts = { @@ -115,7 +115,7 @@ class UpdateCourseForm(CourseForm): 'init_date': _('Date that the course starts (dd/mm/yyyy)'), 'end_date': _('Date that the course ends (dd/mm/yyyy)'), 'image': _('Representative image of the course'), - 'category': _('Category which the course belongs'), + 'category': _('CourseCategory which the course belongs'), 'students': _("Course's Students"), } widgets = { diff --git a/courses/models.py b/courses/models.py index e140d14..096b0e4 100644 --- a/courses/models.py +++ b/courses/models.py @@ -31,7 +31,7 @@ class Course(models.Model): init_date = models.DateField(_('Begin of Course Date')) end_date = models.DateField(_('End of Course Date')) image = models.ImageField(verbose_name = _('Image'), blank = True, upload_to = 'courses/') - category = models.ForeignKey(Category, verbose_name = _('Category')) + category = models.ForeignKey(CourseCategory, verbose_name = _('Category')) professors = models.ManyToManyField(User,verbose_name=_('Professors'), related_name='courses_professors') students = models.ManyToManyField(User,verbose_name=_('Students'), related_name='courses_student') diff --git a/courses/views.py b/courses/views.py index 9637062..507155f 100644 --- a/courses/views.py +++ b/courses/views.py @@ -11,8 +11,8 @@ from rolepermissions.verifications import has_role from django.db.models import Q from rolepermissions.verifications import has_object_permission -from .forms import CourseForm, UpdateCourseForm, CategoryForm, SubjectForm,TopicForm,ActivityForm -from .models import Course, Subject, Category,Topic, SubjectCategory,Activity +from .forms import CourseForm, UpdateCourseForm, CategoryCourseForm, SubjectForm,TopicForm,ActivityForm +from .models import Course, Subject, CourseCategory,Topic, SubjectCategory,Activity from core.mixins import NotificationMixin from users.models import User @@ -29,7 +29,7 @@ class IndexView(LoginRequiredMixin, NotificationMixin, generic.ListView): def get_context_data(self, **kwargs): context = super(IndexView, self).get_context_data(**kwargs) - context['categories'] = Category.objects.all() + context['categories'] = CourseCategory.objects.all() context['courses_teacher'] = Course.objects.filter(professors__name = self.request.user.name) context['courses_student'] = Course.objects.filter(students__name = self.request.user.name) @@ -178,13 +178,13 @@ class FilteredView(LoginRequiredMixin, generic.ListView): paginate_by = 3 def get_queryset(self): - category = get_object_or_404(Category, slug = self.kwargs.get('slug')) + category = get_object_or_404(CourseCategory, slug = self.kwargs.get('slug')) return Course.objects.filter(category = category) def get_context_data(self, **kwargs): - category = get_object_or_404(Category, slug = self.kwargs.get('slug')) + category = get_object_or_404(CourseCategory, slug = self.kwargs.get('slug')) context = super(FilteredView, self).get_context_data(**kwargs) - context['categories'] = Category.objects.all() + context['categories'] = CourseCategory.objects.all() context['cat'] = category return context @@ -193,7 +193,7 @@ class IndexCatView(LoginRequiredMixin, generic.ListView): login_url = reverse_lazy("core:home") redirect_field_name = 'next' - queryset = Category.objects.all() + queryset = CourseCategory.objects.all() template_name = 'category/index.html' context_object_name = 'categories' paginate_by = 3 @@ -204,7 +204,7 @@ class CreateCatView(LoginRequiredMixin, HasRoleMixin, generic.edit.CreateView): login_url = reverse_lazy("core:home") redirect_field_name = 'next' template_name = 'category/create.html' - form_class = CategoryForm + form_class = CategoryCourseForm success_url = reverse_lazy('course:manage_cat') def render_to_response(self, context, **response_kwargs): @@ -218,8 +218,8 @@ class UpdateCatView(LoginRequiredMixin, HasRoleMixin, generic.UpdateView): login_url = reverse_lazy("core:home") redirect_field_name = 'next' template_name = 'category/update.html' - model = Category - form_class = CategoryForm + model = CourseCategory + form_class = CategoryCourseForm success_url = reverse_lazy('course:manage_cat') def render_to_response(self, context, **response_kwargs): @@ -230,7 +230,7 @@ class UpdateCatView(LoginRequiredMixin, HasRoleMixin, generic.UpdateView): class ViewCat(LoginRequiredMixin, generic.DetailView): login_url = reverse_lazy("core:home") redirect_field_name = 'next' - model = Category + model = CourseCategory template_name = 'category/view.html' context_object_name = 'category' @@ -239,7 +239,7 @@ class DeleteCatView(LoginRequiredMixin, HasRoleMixin, generic.DeleteView): allowed_roles = ['professor', 'system_admin'] login_url = reverse_lazy("core:home") redirect_field_name = 'next' - model = Category + model = CourseCategory template_name = 'category/delete.html' success_url = reverse_lazy('course:manage_cat') -- libgit2 0.21.2