Projet

Général

Profil

0001-manager-pass-over-deleted-fields-in-custom-cell-layo.patch

Frédéric Péters, 20 septembre 2021 11:00

Télécharger (2,44 ko)

Voir les différences: 

Subject: [PATCH] manager: pass over deleted fields in custom cell layout js
 (#57082)


 combo/manager/static/js/combo.manager.js | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)
combo/manager/static/js/combo.manager.js
530 530 
      grid_cell.dataset[key] = schema_cell[key];
531 531 
    }
532 532 
    // set cell text
533 
    let schema_field = _self.field_with_varname(schema_cell.varname);
533 534 
    let cell_text = "";
534 
    cell_text += '<span class="' + schema_cell.display_mode + '">' + _self.field_with_varname(schema_cell.varname).label + '</span>';
535 
    cell_text += '<span class="cell-meta">';
536 
    let cell_display_mode_label = $(this.grid_cell_form).find('select[name="display_mode"] option[value="' + schema_cell.display_mode + '"]').text();
537 
    cell_text += '<span class="cell-display-mode-label">' + cell_display_mode_label + '</span>';
538 
    let cell_size_label = $(this.grid_cell_form).find('select[name="cell_size"] option[value="' + schema_cell.cell_size + '"]').text();
539 
    cell_text += '<span class="cell-size-label">' + gettext('Size:') + ' ' + cell_size_label + '</span>';
540 
    cell_text += '</span>';
535 
    if (schema_field) {
536 
      cell_text += '<span class="' + schema_cell.display_mode + '">' + schema_field.label + '</span>';
537 
      cell_text += '<span class="cell-meta">';
538 
      let cell_display_mode_label = $(this.grid_cell_form).find('select[name="display_mode"] option[value="' + schema_cell.display_mode + '"]').text();
539 
      cell_text += '<span class="cell-display-mode-label">' + cell_display_mode_label + '</span>';
540 
      let cell_size_label = $(this.grid_cell_form).find('select[name="cell_size"] option[value="' + schema_cell.cell_size + '"]').text();
541 
      cell_text += '<span class="cell-size-label">' + gettext('Size:') + ' ' + cell_size_label + '</span>';
542 
      cell_text += '</span>';
543 
    } else {
544 
      cell_text += '<span class="warning">' + gettext('Deleted field:') + ' ' + schema_cell.varname + '</span>';
545 
    }
541 546 
    grid_cell.contentEl.innerHTML = cell_text;
542 547 
  },
543 548 
  grid_cell__add: function(schema_cell) {
544 
-