Inclusion connecteur

FIXME La liste des connecteurs disparait dans /manage/add
    TODO logs ?

passerelle/passerelle/apps/ldap/migrations/0001_initial.py

@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('base', '0002_auto_20151009_0326'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='LDAPResource',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('title', models.CharField(max_length=50)),
+                ('slug', models.SlugField()),
+                ('description', models.TextField()),
+                ('log_level', models.CharField(default=b'NOTSET', max_length=10, verbose_name='Log Level', choices=[(b'NOTSET', b'NOTSET'), (b'DEBUG', b'DEBUG'), (b'INFO', b'INFO'), (b'WARNING', b'WARNING'), (b'ERROR', b'ERROR'), (b'CRITICAL', b'CRITICAL'), (b'FATAL', b'FATAL')])),
+                ('users', models.ManyToManyField(to='base.ApiUser', blank=True)),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+    ]

passerelle/passerelle/apps/ldap/models.py

@@ -6,8 +6,8 @@ from passerelle.utils.api import endpoint
 #import lookups
 
 import sys
-sys.path.insert(0, "/home/paul/Documents/paul-synchro/django/sp_sso/saml/")
-import utils
+#sys.path.insert(0, "/home/paul/Documents/paul-synchro/django/sp_sso/saml/")
+#import utils
 
 
 #TODO
@@ -26,7 +26,7 @@ def format_org_unit(u):
 def get_org_unit(u):
     return 0
 
-class LDAPConnector(BaseResource):
+class LDAPResource(BaseResource):
 
     @classmethod
     def get_icon_class(cls):

passerelle/passerelle/apps/ldap/urls.py

@@ -19,12 +19,12 @@ from django.conf.urls import patterns, include, url
 from .views import *
 
 urlpatterns = patterns('',
-    url(r'^(?P<slug>[\w,-]+)/data$', LDAPConnectorView.as_view(), name='ldap_conn-data'),
+    url(r'^(?P<slug>[\w,-]+)/data$', LDAPView.as_view(), name='ldap-data'),
 )
 
 management_urlpatterns = patterns('',
     url(r'^(?P<connector_slug>[\w,-]+)/download/$',
-        LDAPDownload.as_view(), name='csv-download'),
+        LDAPDownload.as_view(), name='ldap-download'),
     url(r'^(?P<connector_slug>[\w,-]+)/queries/new/$',
         NewQueryView.as_view(), name='ldap-new-query'),
     url(r'^(?P<connector_slug>[\w,-]+)/queries/(?P<pk>[\w,-]+)/$',

passerelle/passerelle/apps/ldap/views.py

@@ -10,10 +10,11 @@ from django.shortcuts import get_object_or_404
 from django.views.generic.detail import SingleObjectMixin
 from django.views.generic import View, UpdateView, CreateView
 
+# Add library search path entry?
 from passerelle import utils
 
-from .forms import QueryForm
-from .models import CsvDataSource, Query
+#from .forms import QueryForm
+#from .models import CsvDataSource, Query
 
 
 
@@ -26,6 +27,48 @@ def dummy_view(request):
     return HttpResponse("Dummy LDAP connector view.")
 
 
-class LDAPConnectorView(View, SingleObjectMixin):
-    def get(request, *args, **kwargs):
+class LDAPView(View, SingleObjectMixin):
+    def get(self, request, *args, **kwargs):
         return HttpResponse("Got the LDAP!")
+
+    def post(self, request, *args, **kwargs):
+        return HttpResponse("Posted the LDAP!")
+
+class LDAPDownload(View):
+    def get(self, request, *args, **kwargs):
+        return HttpResponse("FIXME Not implemented yet")
+
+class NewQueryView(CreateView):
+    #model = Query #FIXME
+    #form_class = QueryForm
+    #template_name = 'csvdatasource/query_form.html'
+
+    def get_context_data(self, **kwargs):
+        #ctx = super(NewQueryView, self).get_context_data(**kwargs)
+        #ctx['resource'] = CsvDataSource.objects.get(slug=self.kwargs['connector_slug'])
+        ctx = {}
+        ctx['foo'] = 'foodata'
+        return ctx
+
+    def get_initial(self):
+        #return {'resource': CsvDataSource.objects.get(slug=self.kwargs['connector_slug']).id}
+        return {'resource': 'fooid'}
+
+    def get_success_url(self):
+        return self.object.resource.get_absolute_url()
+
+
+class UpdateQueryView(UpdateView):
+    #model = Query #FIXME
+    #form_class = QueryForm
+    #template_name = 'csvdatasource/query_form.html'
+
+    def get_context_data(self, **kwargs):
+        #ctx = super(UpdateQueryView, self).get_context_data(**kwargs)
+        #ctx['resource'] = CsvDataSource.objects.get(slug=self.kwargs['connector_slug'])
+        ctx = {}
+        ctx['foo'] = 'foodata'
+        return ctx
+
+    def get_success_url(self):
+        return self.object.resource.get_absolute_url()

passerelle/passerelle/settings.py

@@ -109,6 +109,7 @@ INSTALLED_APPS = (
     'bdp',
     'base_adresse',
     'csvdatasource',
+    #'ldap',
     'orange',
     'family',
     # backoffice templates and static