0002-wcs-add-cell-pagination-10179.patch

Valentin Deniaud, 21 octobre 2019 15:30

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

Subject: [PATCH 2/2] wcs: add cell pagination (#10179)

 combo/apps/wcs/models.py                      | 51 +++++++++++++++++++
 .../templates/combo/wcs/user_all_forms.html   |  6 +++
 combo/public/static/js/combo.public.js        | 12 ++++-
 3 files changed, 68 insertions(+), 1 deletion(-)

         cache_duration = 5
         api_url = None
         warn_on_404 = True
         paginate_by = 0
         def get_api_url(self, context):
             return self.api_url
-...
             wcs_sites = copy.deepcopy(wcs_sites)
             returns = set([])
             api_url = self.get_api_url(context)
             if self.paginate_by:
                 cursor_dir = None
                 cursor = None
                 if 'before' in context['request'].GET:
                     cursor_dir = 'before'
                 elif 'after' in context['request'].GET:
                     cursor_dir = 'after'
                 if cursor_dir:
                     cursor = context['request'].GET[cursor_dir]
                     api_url = self.add_pagination(api_url, cursor, cursor_dir)
             for wcs_slug, wcs_site in wcs_sites.items():
                 url = wcs_site.get('url')
                 if not url.endswith('/'):
-...
                 if returns != set([404]) or self.warn_on_404:
                     logging.error('failed to get data from any %s (%r)', api_url, returns)
             if self.paginate_by:
                 all_forms = []
                 for site in wcs_sites.values():
                     if site.get('data'):
                         all_forms.extend(site['data'])
                 field = 'form_receipt_datetime'
                 all_forms.sort(key=lambda x: x[field], reverse=True)
                 limit_reached = len(all_forms) <= self.paginate_by
                 if cursor_dir == 'after':
                     all_forms = all_forms[:self.paginate_by]
                     context['before'] = all_forms[0][field]
                     context['after'] = all_forms[-1][field] if not limit_reached else None
                 elif cursor_dir == 'before':
                     all_forms = all_forms[-self.paginate_by:]
                     context['before'] = all_forms[0][field] if not limit_reached else None
                     context['after'] = all_forms[-1][field]
                 else:  # first page
                     all_forms = all_forms[:self.paginate_by]
                     context['before'] = None
                     context['after'] = all_forms[-1][field]
                 wcs_sites = {'paginated': {'data': all_forms}}
             return wcs_sites
         def get_cell_extra_context(self, context):
             return {self.variable_name: self.get_data(context)}
         def add_pagination(self, url, cursor=None, cursor_dir=None):
             pagination_qs = 'limit={limit}'.format(
                 limit=self.paginate_by + 1  # ask for more to detect end page
+            )
             if cursor:
                 pagination_qs = '&'.join((
                     pagination_qs,
                     '{cursor_direction}={cursor}'.format(cursor_direction=cursor_dir,
                                                          cursor=cursor)
                 ))
             if '?' in url:
                 return '&'.join((url, pagination_qs))
             else:
                 return '?'.join((url, pagination_qs))
     class WcsDataBaseCell(CellBase, WcsBlurpMixin):
         is_enabled = classmethod(is_wcs_enabled)
-...
         categories = JSONField(_('Categories'), blank=True)
         current_forms = models.BooleanField(_('Current Forms'), default=True)
         done_forms = models.BooleanField(_('Done Forms'), default=False)
         paginate_by = 3
         class Meta:
             verbose_name = _('User Forms')

       {% include "combo/wcs/list_of_forms.html" with forms=forms %}
       </div>
     {% endfor %}
     {% if before %}
     <a name="before" value="{{ before }}" href="#nothing" class="combo-refresh">{% trans 'Previous' %}</a>
     {% endif %}
     {% if after %}
     <a name="after" value="{{ after }}" href="#nothing" class="combo-refresh">{% trans 'Next' %}</a>
     {% endif %}
     {% endblock %}

     function combo_load_cell(elem) {
     function combo_load_cell(elem, extra_params) {
       var $elem = $(elem);
       var url = $elem.data('ajax-cell-url');
       var extra_context = $elem.data('extra-context');
-...
       if (extra_context) {
         qs += 'ctx=' + extra_context;
+      }
       if (extra_params) {
         qs += '&' + $.param(extra_params)
+      }
       $.ajax({url: url + qs,
               xhrFields: { withCredentials: true },
               async: true,
-...
             window.location.search = new_qs;
+        }
       });
       $(document).on('click', '.combo-refresh', function (e) {
         var $target = $(e.target);
         var value = $target.attr('value');
         var name = $target[0].name;
         var cell = $target.parents('.wcscurrentformscell')[0]
         combo_load_cell(cell, {[name]: value});
       });
       $(document).on('click', '.more-items a', function() {
         $(this).parent().hide();
+    -

Projet

Général

Profil

Produits Entr'ouvert » Combo

0002-wcs-add-cell-pagination-10179.patch