0001-misc-share-query-management-template-code-20535.patch

Valentin Deniaud, 06 avril 2020 18:28

Voir les différences: en ligne côte à côte

Subject: [PATCH 1/5] misc: share query management template code (#20535)

 .../migrations/0006_auto_20200401_1025.py     | 31 ++++++++++++++++
 passerelle/apps/arcgis/models.py              |  3 +-
 .../templates/arcgis/arcgis_detail.html       | 25 -------------
 .../migrations/0016_auto_20200406_1702.py     | 36 +++++++++++++++++++
 passerelle/apps/csvdatasource/models.py       | 18 +++++++++-
 .../csvdatasource/csvdatasource_detail.html   | 27 +-------------
 .../passerelle/manage/service_view.html       | 25 +++++++++++++
 7 files changed, 112 insertions(+), 53 deletions(-)
 create mode 100644 passerelle/apps/arcgis/migrations/0006_auto_20200401_1025.py
 create mode 100644 passerelle/apps/csvdatasource/migrations/0016_auto_20200406_1702.py

     # -*- coding: utf-8 -*-
     # Generated by Django 1.11.18 on 2020-04-01 08:25
     from __future__ import unicode_literals
     from django.db import migrations, models
     import django.db.models.deletion
     class Migration(migrations.Migration):
         dependencies = [
             ('arcgis', '0005_auto_20200310_1517'),
+        ]
         operations = [
             migrations.AlterField(
                 model_name='arcgis',
                 name='client_certificate',
                 field=models.FileField(blank=True, null=True, upload_to='', verbose_name='TLS client certificate'),
             ),
             migrations.AlterField(
                 model_name='arcgis',
                 name='trusted_certificate_authorities',
                 field=models.FileField(blank=True, null=True, upload_to='', verbose_name='TLS trusted CAs'),
             ),
             migrations.AlterField(
                 model_name='query',
                 name='resource',
                 field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='queries', to='arcgis.ArcGIS', verbose_name='Resource'),
             ),
+        ]

         def export_json(self):
             d = super(ArcGIS, self).export_json()
             d['queries'] = [query.export_json() for query in self.query_set.all()]
             d['queries'] = [query.export_json() for query in self.queries.all()]
             return d
         @classmethod
-...
     class Query(models.Model):
         resource = models.ForeignKey(
             to=ArcGIS,
             related_name='queries',
             verbose_name=_('Resource'))
         name = models.CharField(

     </ul>
     {% endif %}
     {% endblock %}
     {% block extra-sections %}
       {% if object|can_edit:request.user %}
         <div id="queries" class="section">
           <h3>{% trans 'Queries' %}</h3>
           <div>
             {% if object.query_set.exists %}
               <ul class="objects-list single-links">
                 {% for query in object.query_set.all %}
                   <li>
                    <a href="{{ query.edit_url }}">{{ query.name }}</a>
                    <a rel="popup" class="delete" href="{{ query.delete_url }}">{% trans "delete query" %}</a>
                   </li>
                 {% endfor %}
               </ul>
             {% else %}
               <p>{% trans 'No query are defined.' %}</p>
             {% endif %}
             <p>
               <a class="icon-plus button" href="{{ object.create_query_url }}">{% trans 'New Query' %}</a>
             </p>
           </div>
         </div>
       {% endif %}
     {% endblock %}

     # -*- coding: utf-8 -*-
     # Generated by Django 1.11.18 on 2020-04-06 15:02
     from __future__ import unicode_literals
     from django.db import migrations, models
     import django.db.models.deletion
     class Migration(migrations.Migration):
         dependencies = [
             ('csvdatasource', '0015_query_slug_unicity'),
+        ]
         operations = [
             migrations.AlterField(
                 model_name='csvdatasource',
                 name='columns_keynames',
                 field=models.CharField(blank=True, default='id, text', help_text='ex: id,text,data1,data2', max_length=256, verbose_name='Column keynames'),
             ),
             migrations.AlterField(
                 model_name='csvdatasource',
                 name='csv_file',
                 field=models.FileField(help_text='Supported file formats: csv, ods, xls, xlsx', upload_to='csv', verbose_name='Spreadsheet file'),
             ),
             migrations.AlterField(
                 model_name='query',
                 name='resource',
                 field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='queries', to='csvdatasource.CsvDataSource'),
             ),
             migrations.AlterField(
                 model_name='query',
                 name='structure',
                 field=models.CharField(choices=[('array', 'Array'), ('dict', 'Dictionary'), ('keyed-distinct', 'Keyed Dictionary'), ('tuples', 'Tuples'), ('onerow', 'Single Row'), ('one', 'Single Value')], default='dict', help_text='Data structure used for the response', max_length=20, verbose_name='Structure'),
             ),
+        ]

     from django.conf import settings
     from django.db import models, transaction
     from django.core.exceptions import ValidationError
     from django.urls import reverse
     from django.utils.translation import ugettext_lazy as _
     from passerelle.base.models import BaseResource
-...
     class Query(models.Model):
         resource = models.ForeignKey('CsvDataSource', on_delete=models.CASCADE)
         resource = models.ForeignKey('CsvDataSource', on_delete=models.CASCADE, related_name='queries')
         slug = models.SlugField(_('Name (slug)'))
         label = models.CharField(_('Label'), max_length=100)
         description = models.TextField(_('Description'), blank=True)
-...
         def import_json(cls, d):
             return cls(**d)
         @property
         def name(self):
             return self.slug
         def delete_url(self):
             return reverse('csv-delete-query',
                            kwargs={'connector_slug': self.resource.slug, 'pk': self.pk})
         def edit_url(self):
             return reverse('csv-edit-query',
                            kwargs={'connector_slug': self.resource.slug, 'pk': self.pk})
     class CsvDataSource(BaseResource):
         csv_file = models.FileField(
-...
             Query.objects.bulk_create(new)
             return instance
         def create_query_url(self):
             return reverse('csv-new-query', kwargs={'connector_slug': self.slug})
     class TableRow(models.Model):
         resource = models.ForeignKey('CsvDataSource', on_delete=models.CASCADE)

       <span class="description">{% trans "Returning lines containing 'abc' in 'text' column (case insensitive):" %}</span>
       <a class="example-url" href="{{ csvdatasource_data_url }}?q=abc">{{ csvdatasource_data_url }}?q=abc</a>
     </li>
     {% for query in object.query_set.all %}
     {% for query in object.queries.all %}
     <li class="get-method"><span class="description">{{ query.label }}:</span>
       <a class="example-url" 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 %}
-...
     {% endfor %}
     </ul>
     {% endblock %}
     {% block extra-sections %}
     {% if object|can_edit:request.user %}
     <div id="queries" class="section">
     <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>
           <a rel="popup" class="delete" href="{% url 'csv-delete-query' connector_slug=object.slug pk=query.id %}">{% trans "delete query" %}</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 %}
     {% endblock %}

       </div>
     </div>
     {% block custom-queries %}
       {% if object|can_edit:request.user and object.queries is not None %}
         <div id="queries" class="section">
           <h3>{% trans 'Queries' %}</h3>
           <div>
             {% if object.queries.exists %}
               <ul class="objects-list single-links">
                 {% for query in object.queries.all %}
                   <li>
                    <a href="{{ query.edit_url }}">{{ query.name }}</a>
                    <a rel="popup" class="delete" href="{{ query.delete_url }}">{% trans "delete query" %}</a>
                   </li>
                 {% endfor %}
               </ul>
             {% else %}
               <p>{% trans 'No query are defined.' %}</p>
             {% endif %}
             <p>
               <a class="icon-plus button" href="{{ object.create_query_url }}">{% trans 'New Query' %}</a>
             </p>
           </div>
         </div>
       {% endif %}
     {% endblock %}
     {% block extra-sections %}
     {% endblock %}
+    -

Projet

Général

Profil

Produits Entr'ouvert » Passerelle

0001-misc-share-query-management-template-code-20535.patch