From 16040cfd84ecdf924b1d27184156bb0888be640d Mon Sep 17 00:00:00 2001 From: Mariana Mendes Date: Tue, 27 Feb 2018 11:13:37 -0300 Subject: [PATCH] Corrige o deleteview e o detailview --- .../migrations/0008_auto_20180227_1111.py | 25 +++++++++++++++++++ sapl/comissoes/models.py | 4 +-- sapl/comissoes/views.py | 8 +++--- 3 files changed, 30 insertions(+), 7 deletions(-) create mode 100644 sapl/comissoes/migrations/0008_auto_20180227_1111.py diff --git a/sapl/comissoes/migrations/0008_auto_20180227_1111.py b/sapl/comissoes/migrations/0008_auto_20180227_1111.py new file mode 100644 index 000000000..478576a1b --- /dev/null +++ b/sapl/comissoes/migrations/0008_auto_20180227_1111.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.13 on 2018-02-27 14:11 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('comissoes', '0007_auto_20180227_1025'), + ] + + operations = [ + migrations.AlterField( + model_name='reuniao', + name='url_audio', + field=models.URLField(blank=True, max_length=150, verbose_name='URL Arquivo Áudio (Formatos MP3 / AAC)'), + ), + migrations.AlterField( + model_name='reuniao', + name='url_video', + field=models.URLField(blank=True, max_length=150, verbose_name='URL Arquivo Vídeo (Formatos MP4 / FLV / WebM)'), + ), + ] diff --git a/sapl/comissoes/models.py b/sapl/comissoes/models.py index 66932ea22..cbe0beeed 100644 --- a/sapl/comissoes/models.py +++ b/sapl/comissoes/models.py @@ -231,10 +231,10 @@ class Reuniao(models.Model): observacao = models.CharField( max_length=150, blank=True, verbose_name=_('Observação')) url_audio = models.URLField( - max_length=150, blank=True, null=True, + max_length=150, blank=True, verbose_name=_('URL Arquivo Áudio (Formatos MP3 / AAC)')) url_video = models.URLField( - max_length=150, blank=True, null=True, + max_length=150, blank=True, verbose_name=_('URL Arquivo Vídeo (Formatos MP4 / FLV / WebM)')) upload_pauta = models.FileField( blank=True, diff --git a/sapl/comissoes/views.py b/sapl/comissoes/views.py index 4183f3315..0fd5a2c13 100644 --- a/sapl/comissoes/views.py +++ b/sapl/comissoes/views.py @@ -178,13 +178,11 @@ class ReuniaoCrud(MasterDetailCrud): return {'comissao': comissao} - class DeleteView(MasterDetailCrud.DeleteView, RedirectView): + class DeleteView(MasterDetailCrud.DeleteView): + pass - def get_success_url(self): - namespace = self.model._meta.app_config.name - return reverse('%s:%s' % (namespace, 'reuniao_list')) - class DetailView(Crud.DetailView): + class DetailView(MasterDetailCrud.DetailView): @xframe_options_exempt def get(self, request, *args, **kwargs):