0001-WIP-get-rid-of-django-tables-19459.patch

Paul Marillonnet, 30 octobre 2017 18:13

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

Subject: [PATCH] WIP get rid of django-tables? (#19459)

 fargo/fargo/tables.py            | 19 -------------
 fargo/fargo/views.py             | 10 +++++--
 fargo/templates/fargo/home.html  |  4 +--
 fargo/templates/fargo/table.html | 61 ++++++++++++----------------------------
 4 files changed, 27 insertions(+), 67 deletions(-)

     from django.utils.translation import ugettext_lazy as _
     import django_tables2 as tables
     from . import models
     class DocumentTable(tables.Table):
         '''Display the list of documents of the user'''
         filename = tables.Column(verbose_name=_('filename').title())
         size = tables.TemplateColumn(template_code='{{ record.document.content.size|filesizeformat }}',
                                      orderable=False,
                                      verbose_name=_('size').title())
         created = tables.DateTimeColumn(verbose_name=_('creation date').title())
         class Meta:
             model = models.Document
             fields = ('filename', 'size', 'created')
             empty_text = _('You currently have no documents')

     from django.views.generic import CreateView, DeleteView, UpdateView, View, TemplateView
     from django.core.urlresolvers import reverse
     from django.contrib.auth.decorators import login_required
     from django.shortcuts import get_object_or_404, resolve_url
     from django.shortcuts import get_object_or_404, resolve_url, render
     from django.http import (HttpResponse, HttpResponseRedirect,
                              HttpResponseForbidden, Http404)
     from django.core import signing
-...
                 .select_related('document', 'user')
     class Homepage(Documents, SingleTableMixin, CommonUpload):
     class Homepage(Documents, CommonUpload):
         '''Show documents of users, eventually paginate and sort them.'''
         template_name = 'fargo/home.html'
         form_class = forms.UploadForm
         table_class = tables.DocumentTable
         model = models.UserDocument
         table_pagination = {
             'per_page': 5,
+        }
-...
         def get_success_url(self):
             return ''
         def get(self, request, *args, **kwargs):
             return render(request, self.template_name,
                     {'user_files': self.model.objects.all()})
     class PickList(Homepage):
         template_name = 'fargo/pick.html'

     {% extends "fargo/base.html" %}
     {% load render_table from django_tables2 %}
     {% load gadjo i18n staticfiles %}
     {% block content %}
-...
       <div class="cell">
       <h2>{% if site_title %}{{ site_title }}{% else %}{% trans "Portfolio" %}{% endif %}</h2>
       {{ user_files }}
       <div id="user-files">
         {% render_table table "fargo/table.html" %}
         {% include "fargo/table.html" %}
         <form id="send-file" method="post" enctype="multipart/form-data">
           {% csrf_token %}
           {{ form.non_field_errors }}

     {% extends "django_tables2/table.html" %}
     {% load django_tables2 %}
     {% load i18n %}
     {% block table.thead %}
       <thead>
     <div class="table-container">
     <table>
         <thead>
         <tr>
           {% for column in table.columns %}
             {% if column.orderable %}
               <th {{ column.attrs.th.as_html }}>
                 <a href="{% querystring table.prefixed_order_by_field=column.order_by_alias.next %}">{{ column.header }}</a>
               </th>
             {% else %}
               <th {{ column.attrs.th.as_html }}>{{ column.header }}</th>
             {% endif %}
           {% endfor %}
           <th></th>
           <th class="action-column"></th>
             <th>Filename</th>
             <th>Description</th>
             <th>Creation date</th>
         </tr>
         </thead>
         <tbody>
         {% for item in user_files%}
         <tr>
             <th>{{ item.filename }}</th>
             <th>{{ item.description }}</th>
             <th>{{ item.created }}</th>
         </tr>
       </thead>
     {% endblock table.thead %}
     {% block table.tbody.row %}
       <tr class="{{ forloop.counter|divisibleby:2|yesno:"even,odd" }} {{row.record.css_classes}}"
           data-url="{{row.record.get_download_url}}"
           > {# avoid cycle for Django 1.2-1.6 compatibility #}
         {% for column, cell in row.items %}
           <td {{ column.attrs.td.as_html }}>{% if column.localize == None %}{{ cell }}{% else %}{% if column.localize %}{{ cell|localize }}{% else %}{{ cell|unlocalize }}{% endif %}{% endif %}</td>
         {% endfor %}
           {% with url=row.record.get_thumbnail_url %}
             <td class="thumbnail">{% if url %}<img src="{{ url }}"/>{% endif %}</td>
           {% endwith %}
         <td class="action-column">
           {% block action-column %}
           {% if include_edit_link %}
             <a class="icon-edit" rel="popup" href="{% url 'edit' pk=row.record.pk %}"></a>
           {% endif %}
           {% if row.record.deletable_by_user %}
           <form method="post" action="{% url 'delete' pk=row.record.pk %}{% querystring %}">
             {% csrf_token %}
             <button class="icon-remove-sign"></button>
           </form>
           {% endif %}
           {% endblock %}
        </td>
       </tr>
     {% endblock table.tbody.row %}
         </tbody>
     </table>
     </div>
     {% block pagination.cardinality %}
     {% endblock %}
+    -

Projet

Général

Profil

Produits Entr'ouvert » Fargo

0001-WIP-get-rid-of-django-tables-19459.patch