Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ patch(SpreadsheetRenderer.prototype, {
const record = this.props.record;
const resId = this.props.res_id;
const name = record.name;
this.onSpreadsheetSaved();
await this.onSpreadsheetSaved();
this.env.services.action.doAction(
{
name: _t("Add to dashboard"),
Expand Down
4 changes: 4 additions & 0 deletions spreadsheet_oca/models/spreadsheet_abstract.py
Original file line number Diff line number Diff line change
Expand Up @@ -177,3 +177,7 @@ def write(self, vals):
if "spreadsheet_raw" in vals:
self.spreadsheet_revision_ids.unlink()
return super().write(vals)

def unlink(self):
self.spreadsheet_revision_ids.unlink()
return super().unlink()
4 changes: 2 additions & 2 deletions spreadsheet_oca/models/spreadsheet_oca_revision.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@

class SpreadsheetOcaRevision(models.Model):
_name = "spreadsheet.oca.revision"
_description = "Spreadsheet Oca Revision" # TODO
_description = "Spreadsheet Revision"

model = fields.Char(required=True)
res_id = fields.Integer(required=True, index=True)
type = fields.Char()
client_id = fields.Char()
server_revision_id = fields.Char()
next_revision_id = fields.Char()
commands = fields.Char()
commands = fields.Text()
2 changes: 1 addition & 1 deletion spreadsheet_oca/models/spreadsheet_spreadsheet.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ class SpreadsheetSpreadsheet(models.Model):
@api.depends("name")
def _compute_filename(self):
for record in self:
record.filename = "%s.json" % (self.name or _("Unnamed"))
record.filename = "%s.json" % (record.name or _("Unnamed"))

def create_document_from_attachment(self, attachment_ids):
attachments = self.env["ir.attachment"].browse(attachment_ids)
Expand Down
4 changes: 2 additions & 2 deletions spreadsheet_oca/security/ir.model.access.csv
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
access_spreadsheet_spreadsheet,access_spreadsheet_spreadsheet,model_spreadsheet_spreadsheet,group_user,1,1,1,1
access_spreadsheet_spreadsheet,access_spreadsheet_spreadsheet,model_spreadsheet_spreadsheet,spreadsheet_oca.group_user,1,1,1,1
access_spreadsheet_oca_revision,access_spreadsheet_oca_revision,model_spreadsheet_oca_revision,base.group_user,1,1,1,1
spreadsheet_oca.access_spreadsheet_spreadsheet_import,access_spreadsheet_spreadsheet_import,spreadsheet_oca.model_spreadsheet_spreadsheet_import,base.group_user,1,1,1,1
access_spreadsheet_import_mode,access_spreadsheet_oca_revision,model_spreadsheet_spreadsheet_import_mode,base.group_user,1,0,0,0
access_spreadsheet_import_mode,access_spreadsheet_import_mode,model_spreadsheet_spreadsheet_import_mode,base.group_user,1,0,0,0
access_spreadsheet_select_row_number,access_spreadsheet_select_row_number,model_spreadsheet_select_row_number,base.group_user,1,1,1,1
access_spreadsheet_spreadsheet_tag,access_spreadsheet_spreadsheet_tag,model_spreadsheet_spreadsheet_tag,spreadsheet_oca.group_user,1,0,0,0
access_spreadsheet_spreadsheet_manager_tag,access_spreadsheet_spreadsheet_manager_tag,model_spreadsheet_spreadsheet_tag,spreadsheet_oca.group_manager,1,1,1,1
6 changes: 3 additions & 3 deletions spreadsheet_oca/static/src/spreadsheet/bundle/filter.esm.js
Original file line number Diff line number Diff line change
Expand Up @@ -105,12 +105,12 @@ export class EditFilterPanel extends Component {
this.state.modelData.hasParentRelation = hasParentRelation;
}
}
var ModelFields = [];
for (var [objectType, objectClass] of Object.entries(
const ModelFields = [];
for (const [objectType, objectClass] of Object.entries(
globalFiltersFieldMatchers
)) {
for (const objectId of objectClass.getIds()) {
var fields = objectClass.getFields(objectId);
const fields = objectClass.getFields(objectId);
this.state.objects[objectType + "_" + objectId] = {
id: objectType + "_" + objectId,
objectId: objectId,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ PivotPanelDisplay.components = {
PivotTitleSectionInsertion,
PivotLayoutConfiguratorWithAggregators,
};
PivotPanelDisplay.properties = {
PivotPanelDisplay.props = {
pivotId: String,
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ export class ActionSpreadsheetOca extends Component {
return;
}
if (this.spreadsheetId) {
this.orm.call(this.model, "write", [this.spreadsheetId, data]);
await this.orm.call(this.model, "write", [this.spreadsheetId, data]);
} else {
this.spreadsheetId = await this.orm.call(this.model, "create", [data]);
}
Expand All @@ -82,7 +82,7 @@ export class ActionSpreadsheetOca extends Component {
cleanSearchParams() {
const searchParams = this.import_data.searchParams;
const context = {};
for (var key of Object.keys(searchParams.context)) {
for (const key of Object.keys(searchParams.context)) {
if (key.startsWith("pivot_") || key.startsWith("graph_")) {
continue;
}
Expand All @@ -91,7 +91,7 @@ export class ActionSpreadsheetOca extends Component {
return {...searchParams, context};
}
async importDataGraph(spreadsheet_model) {
var sheetId = spreadsheet_model.getters.getActiveSheetId();
let sheetId = spreadsheet_model.getters.getActiveSheetId();
if (this.import_data.new === undefined && this.import_data.new_sheet) {
sheetId = uuidGenerator.uuidv4();
spreadsheet_model.dispatch("CREATE_SHEET", {
Expand Down Expand Up @@ -136,7 +136,7 @@ export class ActionSpreadsheetOca extends Component {
});
}
importCreateOrReuseSheet(spreadsheet_model) {
var sheetId = spreadsheet_model.getters.getActiveSheetId();
let sheetId = spreadsheet_model.getters.getActiveSheetId();
if (this.import_data.new === undefined) {
sheetId = uuidGenerator.uuidv4();
spreadsheet_model.dispatch("CREATE_SHEET", {
Expand All @@ -153,7 +153,7 @@ export class ActionSpreadsheetOca extends Component {
return sheetId;
}
async importDataList(spreadsheet_model) {
var sheetId = this.importCreateOrReuseSheet(spreadsheet_model);
let sheetId = this.importCreateOrReuseSheet(spreadsheet_model);
if (!sheetId) {
const sheetIds = spreadsheet_model.getters.getSheetIds();
sheetId = sheetIds.length ? sheetIds[0] : uuidGenerator.uuidv4();
Expand Down Expand Up @@ -194,7 +194,7 @@ export class ActionSpreadsheetOca extends Component {
});
}
async importDataPivot(spreadsheet_model) {
var sheetId = this.importCreateOrReuseSheet(spreadsheet_model);
const sheetId = this.importCreateOrReuseSheet(spreadsheet_model);
const pivotId = uuidGenerator.uuidv4();
const fields = this.import_data.metaData.fields || {};
const activeMeasures = this.import_data.metaData.activeMeasures;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ class SpreadsheetTransportService {
this.res_id = res_id;
this.channel = "spreadsheet_oca;" + this.model + ";" + this.res_id;
this.bus_service.addChannel(this.channel);
this.dialog = useService("dialog");
this.bus_service.subscribe("notification", (payload) => {
if (payload.id === this.res_id) {
this._handleNotification(payload);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ patch(PivotRenderer.prototype, {
);
},
getSpreadsheetInsertionTooltip() {
var message = _t("Add to spreadsheet");
let message = _t("Add to spreadsheet");
if (this.containsDuplicatedGroupBys()) {
message = _t("Duplicated groupbys in pivot are not supported");
} else if (this.isComparingInfo()) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {useService} from "@web/core/utils/hooks";
class SpreadsheetFileUploader extends Component {
setup() {
this.orm = useService("orm");
this.notification = useService("notification");
this.attachmentIdsToProcess = [];
this.action = useService("action");
}
Expand Down
Loading