entrouvert
/
passerelle-maarch
Archived
17
0
Fork 0
Code Issues Pull Requests Releases Activity

viewRequest: add table_name and adr_table_name params

This commit is contained in:
Thomas NOËL 2015-04-17 16:46:23 +02:00
parent 04ddc1bff0
commit 5667f7a65f
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
passerelle_maarch/urls.py
View File

@ -27,8 +27,10 @@ public_urlpatterns = patterns('',
name='maarch-ping'),
url(r'^(?P<slug>[\w,-]+)/resource/$', MaarchResourceView.as_view(),
name='maarch-resource'),
url(r'^(?P<slug>[\w,-]+)/resource/(?P<resource_id>\d+)/$', MaarchResourceView.as_view(),
url(r'^(?P<slug>[\w,-]+)/resource/(?P<table_name>[\w_-]+)/(?P<resource_id>\d+)/$', MaarchResourceView.as_view(),
name='maarch-resource-id'),
url(r'^(?P<slug>[\w,-]+)/resource/(?P<table_name>[\w_-]+)/(?P<adr_table_name>[\w_-]*)/(?P<resource_id>\d+)/$', MaarchResourceView.as_view(),
name='maarch-resource-id-adr'),
url(r'^(?P<slug>[\w,-]+)/contact/$', MaarchContactView.as_view(),
name='maarch-contact'),
url(r'^(?P<slug>[\w,-]+)/contact/(?P<contact_id>\d+)/$', MaarchContactView.as_view(),

6
passerelle_maarch/views.py
View File

@ -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')