diff --git a/src/adega/urls.py b/src/adega/urls.py index fbe1bb466cd7f2345672de6cbc19bea5eaef79d1..f56d72015c665e819a46fa6f4d726f89bb73eeef 100644 --- a/src/adega/urls.py +++ b/src/adega/urls.py @@ -21,7 +21,7 @@ urlpatterns = [ url(r'^degree/(?P\w*)/', include('degree.urls', namespace='degree')), - url(r'^adega/cepe9615/(?P\w*)/', include('cepe9615.urls', namespace='cepe9615')), + url(r'^cepe9615/(?P\w*)/', include('cepe9615.urls', namespace='cepe9615')), url(r'^public/', include('public.urls', namespace='public')), diff --git a/src/cepe9615/models.py b/src/cepe9615/models.py index 56efc5670785fd0d027895d06ca706b0dcdfaa50..71a836239075aa6e6e4ecb700e9c42c95c022d91 100644 --- a/src/cepe9615/models.py +++ b/src/cepe9615/models.py @@ -1,15 +1,3 @@ from django.db import models -from django.contrib.auth.models import User - -class Cepe9615(models.Model): - name = models.CharField(max_length=40) - - code = models.CharField(max_length=40) - - manager = models.ForeignKey(User) - def __str__(self): - return self.name - def clean_code(self): - if '/' in self.code: - raise ValidationError('Valor inválido: O código não pode conter "/"') +# Create your models here. diff --git a/src/cepe9615/views.py b/src/cepe9615/views.py index d8d7b5683875fa3e4f6bd56cf274dc26e245be98..88b212f3e5977c153a0b116c94e7f7629a4a2123 100644 --- a/src/cepe9615/views.py +++ b/src/cepe9615/views.py @@ -1,15 +1,12 @@ from django.shortcuts import render, redirect from django.views.generic import View -from django.contrib.auth.decorators import login_required from django.contrib.auth import logout as process_logout -from report_api.views import get_cepe9615_information -from cepe9615.models import Cepe9615 +from report_api.views import get_degree_information +from degree.models import Degree from submission.models import Submission import json from guardian.decorators import permission_required_or_403 - - @permission_required_or_403('view_cepe9615', (Submission, 'id', 'submission_id')) def index(request, submission_id): submission_id = int(submission_id)