From 5667f7a65f065a485c30279d8571fa7307a027f9 Mon Sep 17 00:00:00 2001 From: Thomas NOEL Date: Fri, 17 Apr 2015 16:46:23 +0200 Subject: [PATCH] viewRequest: add table_name and adr_table_name params --- passerelle_maarch/urls.py | 4 +++- passerelle_maarch/views.py | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/passerelle_maarch/urls.py b/passerelle_maarch/urls.py index 118feb6..1562dfc 100644 --- a/passerelle_maarch/urls.py +++ b/passerelle_maarch/urls.py @@ -27,8 +27,10 @@ public_urlpatterns = patterns('', name='maarch-ping'), url(r'^(?P[\w,-]+)/resource/$', MaarchResourceView.as_view(), name='maarch-resource'), - url(r'^(?P[\w,-]+)/resource/(?P\d+)/$', MaarchResourceView.as_view(), + url(r'^(?P[\w,-]+)/resource/(?P[\w_-]+)/(?P\d+)/$', MaarchResourceView.as_view(), name='maarch-resource-id'), + url(r'^(?P[\w,-]+)/resource/(?P[\w_-]+)/(?P[\w_-]*)/(?P\d+)/$', MaarchResourceView.as_view(), + name='maarch-resource-id-adr'), url(r'^(?P[\w,-]+)/contact/$', MaarchContactView.as_view(), name='maarch-contact'), url(r'^(?P[\w,-]+)/contact/(?P\d+)/$', MaarchContactView.as_view(), diff --git a/passerelle_maarch/views.py b/passerelle_maarch/views.py index 82a1c81..7ce2bee 100644 --- a/passerelle_maarch/views.py +++ b/passerelle_maarch/views.py @@ -78,11 +78,13 @@ class MaarchPingView(MaarchDetailView): class MaarchResourceView(MaarchDetailView): - def get_data(self, request, resource_id=None, *args, **kwargs): + def get_data(self, request, resource_id=None, table_name=None, adr_table_name=None, *args, **kwargs): client = self.get_client() if resource_id: + if not adr_table_name: + adr_table_name = 'adr_x' results = client.service.viewResource(int(resource_id), - 'res_x', 'adr_x', True) + table_name, adr_table_name, True) else: if 'where' in request.GET: searchParams = client.factory.create('searchParams')