From 9c911275f637dca6565089b190b016efa5a9ea63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C5=B1n=20Tam=C3=A1s?= <39731766+buntamas@users.noreply.github.com> Date: Tue, 17 Mar 2020 12:00:27 +0100 Subject: [PATCH] Fixed that can't select a different sheet #2307 (#2390) --- extensions/gdata/module/scripts/index/importing-controller.js | 2 ++ .../google/refine/extension/gdata/GDataImportingController.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/extensions/gdata/module/scripts/index/importing-controller.js b/extensions/gdata/module/scripts/index/importing-controller.js index 653997683..82478cec6 100644 --- a/extensions/gdata/module/scripts/index/importing-controller.js +++ b/extensions/gdata/module/scripts/index/importing-controller.js @@ -128,6 +128,7 @@ Refine.GDataImportingController.prototype.getOptions = function() { this._parsingPanelElmts.sheetRecordContainer.find('input').each(function() { if (this.checked) { options.sheetUrl = this.getAttribute('sheetUrl'); + options.worksheetIndex = this.getAttribute('worksheetIndex'); } }); @@ -243,6 +244,7 @@ Refine.GDataImportingController.prototype._showParsingPanel = function() { .attr('type', 'radio') .attr('name', 'gdata-importing-parsing-worksheet') .attr('sheetUrl', this.link) + .attr('worksheetIndex', this.worksheetIndex) .appendTo(td0); if (i === 0) { checkbox.prop("checked", true); diff --git a/extensions/gdata/src/com/google/refine/extension/gdata/GDataImportingController.java b/extensions/gdata/src/com/google/refine/extension/gdata/GDataImportingController.java index 8c258504e..41ae3befc 100644 --- a/extensions/gdata/src/com/google/refine/extension/gdata/GDataImportingController.java +++ b/extensions/gdata/src/com/google/refine/extension/gdata/GDataImportingController.java @@ -161,12 +161,14 @@ public class GDataImportingController implements ImportingController { List worksheetEntries = getWorksheetEntriesForDoc(token, spreadSheetId); + int workSheetIndex = 0; for (Sheet sheet : worksheetEntries) { ObjectNode worksheetO = ParsingUtilities.mapper.createObjectNode(); JSONUtilities.safePut(worksheetO, "name", sheet.getProperties().getTitle()); JSONUtilities.safePut(worksheetO, "rows", sheet.getProperties().getGridProperties().getRowCount()); JSONUtilities.safePut(worksheetO, "link", "https://sheets.googleapis.com/v4/spreadsheets/" + spreadSheetId + "/values/" + sheet.getProperties().getTitle()); + JSONUtilities.safePut(worksheetO, "worksheetIndex", workSheetIndex++); JSONUtilities.append(worksheets, worksheetO); }