Commit fdef5c51 authored by GoshaZotov's avatar GoshaZotov

+ previous changes

parent 2bfeac48
......@@ -5654,7 +5654,7 @@ TableColumn.prototype.generateTotalsRowLabel = function(){
};
TableColumn.prototype.generateTotalsRowFunction = function(ws, tablePart){
//TODO добавить в перевод
if(this.TotalsRowFunction === null)
if(null === this.TotalsRowFunction && null === this.TotalsRowLabel)
{
this.TotalsRowFunction = Asc.ETotalsRowFunction.totalrowfunctionCustom;
this.setTotalsRowFormula("SUBTOTAL(109," + tablePart.DisplayName + "[" + this.Name + "])", ws);
......
......@@ -3020,6 +3020,7 @@
else
{
tableColumn.setTotalsRowLabel(label);
cell.setType(CellValueType.String);
}
this._addHistoryObj({nCol: cell.bbox.c1, nRow: cell.bbox.r1, formula: oldFormula, val: oldLabel}, AscCH.historyitem_AutoFilter_ChangeTotalRow, {activeCells: range, nCol: cell.bbox.c1, nRow: cell.bbox.r1, formula: formula, val: label});
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment