Debut adaptation formulaires connecteur csv vers connecteur ldap

passerelle/passerelle/apps/ldap/templates/ldap/ldap_detail.html

@@ -0,0 +1,84 @@
+{% extends "passerelle/manage/service_view.html" %}
+{% load i18n passerelle %}
+
+{% block content %}
+{% if object.description %}{{object.description|linebreaks}}{% endif %}
+
+<p>
+  {% trans "File:" %}
+  {% if object|can_edit:request.user %}<a href="{% url 'csv-download' connector_slug=object.slug %}">{{object.csv_file}}</a>
+  {% else %}{{object.csv_file}}{% endif %}
+</p>
+
+<div id="endpoints">
+<h3>{% trans 'Endpoints' %}</h3>
+<ul>
+  <li>{% trans "Returning all file lines: "%}
+    <a href="{% url "csvdatasource-data" slug=object.slug %}">{%  url "csvdatasource-data" slug=object.slug %}</a>
+  </li>
+  <ul>
+  <li>{% trans "Simple filter: returning lines containing 'abc' in 'text' column: "%}
+    <a href="{% url "csvdatasource-data" slug=object.slug %}?q=abc">{%  url "csvdatasource-data" slug=object.slug %}?q=abc</a>
+  </li>
+  <li>
+    {% trans "Advanced filters: combination of column key name and filter." %}
+    {% trans "Example:" %} <a href="{% url "csvdatasource-data" slug=object.slug %}?text__icontains=abc&id__gt=17">
+      {% url "csvdatasource-data" slug=object.slug %}?text__icontains=abc&id__gt=17</a>
+      <ul>
+          <li><strong>contains</strong>: {%trans 'key name contains value'%}</li>
+          <li><strong>icontains</strong>: {%trans 'key name contains value (insensitive)' %}</li>
+          <li><strong>gt</strong>: {%trans 'key name greater than value'%}</li>
+          <li><strong>ge</strong>: {%trans 'key name greater or equal to value'%}</li>
+          <li><strong>lt</strong>: {%trans 'key name less than value'%}</li>
+          <li><strong>le</strong>: {%trans 'key name less than or equal to value'%}</li>
+          <li><strong>eq (=)</strong>: {%trans 'key name equal to value'%}</li>
+          <li><strong>ieq (=)</strong>: {%trans 'key name equal to value (insensitive)'%}</li>
+          <li><strong>ne</strong>: {%trans 'key name not equal to value'%}</li>
+          <li><strong>ine</strong>: {%trans 'key name not equal to value (insensitive)'%}</li>
+      </ul>
+      <p>
+  </li>
+  </ul>
+  {% for query in object.query_set.all %}
+  <li>{{ query.label }}:
+    <a href="{% url 'generic-endpoint' connector='csvdatasource' slug=object.slug endpoint='query' rest=query.slug %}/">{% url 'generic-endpoint' connector='csvdatasource' slug=object.slug endpoint='query' rest=query.slug %}/</a>
+    {% if query.description %}&mdash; {{ query.description }}{% endif %}
+  </li>
+  {% endfor %}
+</ul>
+</div>
+
+{% if object|can_edit:request.user %}
+<div id="queries">
+<h3>{% trans 'Queries' %}</h3>
+<div>
+{% if object.query_set.count %}
+<ul class="objects-list single-links">
+{% for query in object.query_set.all %}
+  <li><a href="{% url 'csv-edit-query' connector_slug=object.slug pk=query.id %}">{{ query.slug }}</a></li>
+{% endfor %}
+</ul>
+{% else %}
+<p>{% trans 'No query are defined.' %}</p>
+{% endif %}
+<p>
+<a class="icon-plus button" href="{% url 'csv-new-query' connector_slug=object.slug %}">{% trans 'New Query' %}</a>
+</p>
+</div>
+</div>
+{% endif %}
+
+{% if perms.base.view_accessright %}
+<div id="security">
+<h3>{% trans "Security" %}</h3>
+<div>
+<p>
+  {% trans 'Access is limited to the following API users:' %}
+</p>
+{% access_rights_table resource=object permission='can_access' %}
+</div>
+</div>
+{% endif %}
+
+{% endblock %}
+

passerelle/passerelle/apps/ldap/templates/ldap/query_form.html

@@ -0,0 +1,34 @@
+{% extends "passerelle/manage.html" %}
+{% load i18n %}
+{% load url from future %}
+
+{% block breadcrumb %}
+{{ block.super }}
+<a href="{{ resource.get_absolute_url }}">{{ resource.title }}</a>
+{% if object.id %}
+<a href="{{ object.id }}">{{ object.slug }}</a>
+{% else %}
+<a href="#">{% trans 'Add Query' %}</a>
+{% endif %}
+{% endblock %}
+
+{% block appbar %}
+<h2>{% if object.id %}{% trans 'Query:' %} {{ object.slug }}{% else %}{% trans 'New Query' %}{% endif %}</h2>
+{% endblock %}
+
+{% block content %}
+
+ <form method="post" enctype="multipart/form-data">
+   <div id="form-content">
+     {% csrf_token %}
+     {{ form.as_p }}
+   </div>
+   {% block buttons %}
+   <div class="buttons">
+     <button class="submit-button">{% trans "Save" %}</button>
+     <a class="cancel" href="{{ resource.get_absolute_url }}">{% trans 'Cancel' %}</a>
+   </div>
+   {% endblock %}
+ </form>
+
+{% endblock %}

passerelle/passerelle/apps/ldap/views.py

@@ -40,9 +40,9 @@ class LDAPDownload(View):
         return HttpResponse("FIXME Not implemented yet")
 
 class NewQueryView(CreateView):
-    #model = Query #FIXME
-    #form_class = QueryForm
-    #template_name = 'csvdatasource/query_form.html'
+    model = Query #FIXME
+    form_class = QueryForm
+    #template_name = 'csvdatasource/query_form.html' #TODO
 
     def get_context_data(self, **kwargs):
         #ctx = super(NewQueryView, self).get_context_data(**kwargs)