From dad2f5bf5f2ddd724c02692f807de47b63bda88b Mon Sep 17 00:00:00 2001 From: Marcio Mazza Date: Wed, 22 Jul 2015 09:45:07 -0300 Subject: [PATCH] Move crud code out of comissoes app --- comissoes/views.py | 84 +--------------------------------------------- sapl/crud.py | 73 ++++++++++++++++++++++++++++++++++++++++ sapl/test_crud.py | 9 +++++ 3 files changed, 83 insertions(+), 83 deletions(-) create mode 100644 sapl/crud.py create mode 100644 sapl/test_crud.py diff --git a/comissoes/views.py b/comissoes/views.py index bdb08d12a..6717a0f97 100644 --- a/comissoes/views.py +++ b/comissoes/views.py @@ -1,89 +1,7 @@ -from braces.views import FormMessagesMixin -from django.conf.urls import url -from django.core.urlresolvers import reverse, reverse_lazy from django.utils.translation import ugettext as _ -from django.views.generic import ( - CreateView, DeleteView, ListView, UpdateView, DetailView) from .forms import ComissaoForm - - -class Crud(object): - - def __init__(self, model_form, create_title): - - self.model_form = model_form - self.create_title = create_title - - self.model = model_form._meta.model - - # urls names - self.namespace = self.model._meta.model_name - - list_url_name = 'list' - create_url_name = 'create' - detail_url_name = 'detail' - update_url_name = 'update' - delete_url_name = 'delete' - - def with_namespace(url_name): - return '%s:%s' % (self.namespace, url_name) - - class BaseMixin(object): - - @property - def title(self): - return self.get_object() - - help_url = '/comissoes/ajuda' # FIXME - - class CrudListView(BaseMixin, ListView): - model = self.model - title = model._meta.verbose_name_plural - - class CrudCreateView(BaseMixin, CreateView): - model = self.model - form_class = ComissaoForm - title = self.create_title - - def get_success_url(self): - return reverse(with_namespace(detail_url_name), - args=(self.object.id,)) - - class CrudDetailView(BaseMixin, DetailView): - model = self.model - - class CrudUpdateView(BaseMixin, FormMessagesMixin, UpdateView): - model = self.model - form_class = ComissaoForm - success_url = reverse_lazy('comissao_list') - form_invalid_message = u"Something went wrong, post was not saved" - - def get_form_valid_message(self): - return u"{0} updated successfully!".format(self.object) - - class CrudDeleteView(BaseMixin, DeleteView): - model = self.model - success_url = reverse_lazy('comissao_list') - - self.CrudListView = CrudListView - self.CrudCreateView = CrudCreateView - self.CrudDetailView = CrudDetailView - self.CrudUpdateView = CrudUpdateView - self.CrudDeleteView = CrudDeleteView - - self.urls = [ - url(r'^$', - CrudListView.as_view(), name=list_url_name), - url(r'^create$', - CrudCreateView.as_view(), name=create_url_name), - url(r'^(?P\d+)$', - CrudDetailView.as_view(), name=detail_url_name), - url(r'^(?P\d+)/edit$', - CrudUpdateView.as_view(), name=update_url_name), - url(r'^(?P\d+)/delete$', - CrudDeleteView.as_view(), name=delete_url_name), - ], 'comissao', 'comissao' +from sapl.crud import Crud comissao_crud = Crud(ComissaoForm, _('Nova Comissão')) diff --git a/sapl/crud.py b/sapl/crud.py new file mode 100644 index 000000000..1dd592c6a --- /dev/null +++ b/sapl/crud.py @@ -0,0 +1,73 @@ +from braces.views import FormMessagesMixin +from django.conf.urls import url +from django.core.urlresolvers import reverse, reverse_lazy +from django.views.generic import ( + CreateView, DeleteView, ListView, UpdateView, DetailView) + + +class Crud(object): + + def __init__(self, model_form, create_title): + + self.model_form = model_form + self.create_title = create_title + + self.model = model_form._meta.model + + # urls names + self.namespace = self.model._meta.model_name + + def in_namespace(url_name): + return '%s:%s' % (self.namespace, url_name) + + class BaseMixin(object): + + @property + def title(self): + return self.get_object() + + help_url = '/comissoes/ajuda' # FIXME + + class CrudListView(BaseMixin, ListView): + model = self.model + title = model._meta.verbose_name_plural + + class CrudCreateView(BaseMixin, CreateView): + model = self.model + form_class = model_form + title = self.create_title + + def get_success_url(self): + return reverse(in_namespace('detail'), args=(self.object.id,)) + + class CrudDetailView(BaseMixin, DetailView): + model = self.model + + class CrudUpdateView(BaseMixin, FormMessagesMixin, UpdateView): + model = self.model + form_class = model_form + success_url = reverse_lazy('comissao_list') + form_invalid_message = u"Something went wrong, post was not saved" + + def get_form_valid_message(self): + return u"{0} updated successfully!".format(self.object) + + class CrudDeleteView(BaseMixin, DeleteView): + model = self.model + success_url = reverse_lazy('comissao_list') + + self.CrudListView = CrudListView + self.CrudCreateView = CrudCreateView + self.CrudDetailView = CrudDetailView + self.CrudUpdateView = CrudUpdateView + self.CrudDeleteView = CrudDeleteView + + self.urls = [ + url(r'^$', CrudListView.as_view(), name='list'), + url(r'^create$', CrudCreateView.as_view(), name='create'), + url(r'^(?P\d+)$', CrudDetailView.as_view(), name='detail'), + url(r'^(?P\d+)/edit$', + CrudUpdateView.as_view(), name='update'), + url(r'^(?P\d+)/delete$', + CrudDeleteView.as_view(), name='delete'), + ], self.namespace, self.namespace diff --git a/sapl/test_crud.py b/sapl/test_crud.py new file mode 100644 index 000000000..b8c0aa7eb --- /dev/null +++ b/sapl/test_crud.py @@ -0,0 +1,9 @@ +from django.core.urlresolvers import reverse + + +def test_reverse(): + assert '/comissoes/' == reverse('comissao:list') + assert '/comissoes/create' == reverse('comissao:create') + assert '/comissoes/2' == reverse('comissao:detail', args=(2,)) + assert '/comissoes/2/edit' == reverse('comissao:update', args=(2,)) + assert '/comissoes/2/delete' == reverse('comissao:delete', args=(2,))