base adresse: rename model to match service name (#10781)
This commit is contained in:
parent
f4c398d9a6
commit
706ab20003
|
@ -1,15 +1,15 @@
|
|||
from django.utils.text import slugify
|
||||
from django import forms
|
||||
|
||||
from .models import BaseAddresse
|
||||
from .models import BaseAdresse
|
||||
|
||||
class BaseAddresseForm(forms.ModelForm):
|
||||
class BaseAdresseForm(forms.ModelForm):
|
||||
class Meta:
|
||||
model = BaseAddresse
|
||||
model = BaseAdresse
|
||||
exclude = ('slug', 'users')
|
||||
|
||||
def save(self, commit=True):
|
||||
if not self.instance.slug:
|
||||
self.instance.slug = slugify(self.instance.title)
|
||||
return super(BaseAddresseForm, self).save(commit=commit)
|
||||
return super(BaseAdresseForm, self).save(commit=commit)
|
||||
|
||||
|
|
|
@ -0,0 +1,15 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('base_adresse', '0005_auto_20160407_0456'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.RenameModel('BaseAddresse', 'BaseAdresse')
|
||||
]
|
|
@ -5,7 +5,7 @@ from django.utils.translation import ugettext_lazy as _
|
|||
from passerelle.base.models import BaseResource
|
||||
|
||||
|
||||
class BaseAddresse(BaseResource):
|
||||
class BaseAdresse(BaseResource):
|
||||
service_url = models.CharField(max_length=128, blank=False,
|
||||
default='https://api-adresse.data.gouv.fr/',
|
||||
verbose_name=_('Service URL'),
|
||||
|
|
|
@ -4,7 +4,7 @@ from django.contrib.auth.decorators import login_required
|
|||
from views import *
|
||||
|
||||
urlpatterns = patterns('',
|
||||
url(r'^(?P<slug>[\w,-]+)/$', BaseAddresseDetailView.as_view(), name='base_adresse-view'),
|
||||
url(r'^(?P<slug>[\w,-]+)/$', BaseAdresseDetailView.as_view(), name='base_adresse-view'),
|
||||
|
||||
url(r'^(?P<slug>[\w,-]+)/search$', SearchView.as_view(), name='base_adresse-search'),
|
||||
url(r'^(?P<slug>[\w,-]+)/search/(?P<path>.*)$', SearchPathView.as_view(), name='base_adresse-path-search'),
|
||||
|
@ -12,7 +12,7 @@ urlpatterns = patterns('',
|
|||
)
|
||||
|
||||
management_urlpatterns = patterns('',
|
||||
url(r'^add$', BaseAddresseCreateView.as_view(), name='base_adresse-add'),
|
||||
url(r'^(?P<slug>[\w,-]+)/edit$', BaseAddresseUpdateView.as_view(), name='base_adresse-edit'),
|
||||
url(r'^(?P<slug>[\w,-]+)/delete$', BaseAddresseDeleteView.as_view(), name='base_adresse-delete'),
|
||||
url(r'^add$', BaseAdresseCreateView.as_view(), name='base_adresse-add'),
|
||||
url(r'^(?P<slug>[\w,-]+)/edit$', BaseAdresseUpdateView.as_view(), name='base_adresse-edit'),
|
||||
url(r'^(?P<slug>[\w,-]+)/delete$', BaseAdresseDeleteView.as_view(), name='base_adresse-delete'),
|
||||
)
|
||||
|
|
|
@ -12,34 +12,34 @@ from django.views.generic.edit import CreateView, UpdateView, DeleteView
|
|||
from passerelle import utils
|
||||
from passerelle.base.views import ResourceView
|
||||
|
||||
from .models import BaseAddresse
|
||||
from .models import BaseAdresse
|
||||
|
||||
from .forms import BaseAddresseForm
|
||||
from .forms import BaseAdresseForm
|
||||
|
||||
|
||||
class BaseAddresseDetailView(DetailView):
|
||||
model = BaseAddresse
|
||||
class BaseAdresseDetailView(DetailView):
|
||||
model = BaseAdresse
|
||||
template_name = 'base_adresse/base_adresse_detail.html'
|
||||
|
||||
def get_context_data(self, **kwargs):
|
||||
context = super(BaseAddresseDetailView, self).get_context_data(**kwargs)
|
||||
context = super(BaseAdresseDetailView, self).get_context_data(**kwargs)
|
||||
return context
|
||||
|
||||
|
||||
class BaseAddresseCreateView(CreateView):
|
||||
model = BaseAddresse
|
||||
form_class = BaseAddresseForm
|
||||
class BaseAdresseCreateView(CreateView):
|
||||
model = BaseAdresse
|
||||
form_class = BaseAdresseForm
|
||||
template_name = 'passerelle/manage/service_form.html'
|
||||
|
||||
|
||||
class BaseAddresseUpdateView(UpdateView):
|
||||
model = BaseAddresse
|
||||
form_class = BaseAddresseForm
|
||||
class BaseAdresseUpdateView(UpdateView):
|
||||
model = BaseAdresse
|
||||
form_class = BaseAdresseForm
|
||||
template_name = 'passerelle/manage/service_form.html'
|
||||
|
||||
|
||||
class BaseAddresseDeleteView(DeleteView):
|
||||
model = BaseAddresse
|
||||
class BaseAdresseDeleteView(DeleteView):
|
||||
model = BaseAdresse
|
||||
template_name = 'passerelle/manage/service_confirm_delete.html'
|
||||
|
||||
def get_success_url(self):
|
||||
|
@ -47,7 +47,7 @@ class BaseAddresseDeleteView(DeleteView):
|
|||
|
||||
|
||||
class SearchView(View, SingleObjectMixin):
|
||||
model = BaseAddresse
|
||||
model = BaseAdresse
|
||||
|
||||
def get_query(self, request, *args, **kwargs):
|
||||
if not 'q' in request.GET:
|
||||
|
@ -89,7 +89,7 @@ class SearchPathView(SearchView):
|
|||
|
||||
|
||||
class ReverseView(View, SingleObjectMixin):
|
||||
model = BaseAddresse
|
||||
model = BaseAdresse
|
||||
|
||||
def get(self, request, *args, **kwargs):
|
||||
response_format = 'json'
|
||||
|
|
Loading…
Reference in New Issue