Projet

Général

Profil

0001-cell-display-error-message-on-ajax-call-failure-2912.patch

Lauréline Guérin, 21 octobre 2019 14:39

Télécharger (2,89 ko)

Voir les différences: 

Subject: [PATCH] cell: display error message on ajax call failure (#29124)


 combo/apps/dashboard/templates/combo/dashboardcell.html | 1 +
 combo/public/static/js/combo.public.js                  | 6 +++++-
 combo/public/templates/combo/placeholder.html           | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)
combo/apps/dashboard/templates/combo/dashboardcell.html
5 5 
<div class="cell {{ cell.css_class_names }} {% if cell.slug %}{{cell.slug}}{% endif %}"
6 6 
     data-ajax-cell-url="{{ site_base }}{% url 'combo-public-ajax-page-cell' page_pk=cell.page.id cell_reference=cell.get_reference %}"
7 7 
     data-ajax-cell-loading-message="{{ cell.loading_message }}"
8 
     data-ajax-cell-error-message="{% trans "Loading error" %}"
8 9 
     {% if cell.ajax_refresh %}
9 10 
     data-ajax-cell-refresh="{{ cell.ajax_refresh }}"
10 11 
     {% endif %}><div>{% render_cell cell %}</div></div>
combo/public/static/js/combo.public.js
28 28 
              $(document).trigger('combo:cell-loaded', $elem);
29 29 
          },
30 30 
          error: function(error) {
31 
              $elem.find('.loading').addClass('error-loading');
31 
              var msg = $(elem).data('ajax-cell-error-message');
32 
              $elem
33 
                  .find('.loading')
34 
                  .addClass('error-loading')
35 
                  .html('<span class="loading-message">' + msg + '</span>');
32 36 
              window.console && console.log(':(', error);
33 37 
          }
34 38 
  });
combo/public/templates/combo/placeholder.html
5 5 
     {% if cell.slug and cell.use_slug_as_id %}id="{{ cell.slug }}"{% endif %}
6 6 
     data-ajax-cell-url="{{ site_base }}{% url 'combo-public-ajax-page-cell' page_pk=cell.page.id cell_reference=cell.get_reference %}"
7 7 
     data-ajax-cell-loading-message="{{ cell.loading_message }}"
8 
     data-ajax-cell-error-message="{% trans "Loading error" %}"
8 9 
     {% if cell.ajax_refresh %}data-ajax-cell-refresh="{{ cell.ajax_refresh }}"{% endif %}
9 10 
     {% if request.extra_context_data %}data-extra-context="{{ request.extra_context_data|signed|urlencode }}"{% endif %}
10 11 
     ><div>{% render_cell cell %}</div></div>
11 
-