diff --git a/frappe/integrations/doctype/google_settings/google_settings.json b/frappe/integrations/doctype/google_settings/google_settings.json index 6f25fa4bf6..ee48fde97b 100644 --- a/frappe/integrations/doctype/google_settings/google_settings.json +++ b/frappe/integrations/doctype/google_settings/google_settings.json @@ -39,8 +39,7 @@ "description": "The browser API key obtained from the Google Cloud Console under \n\"APIs & Services\" > \"Credentials\"\n", "fieldname": "api_key", "fieldtype": "Data", - "label": "API Key", - "mandatory_depends_on": "google_drive_picker_enabled" + "label": "API Key" }, { "depends_on": "enable", @@ -76,7 +75,7 @@ ], "issingle": 1, "links": [], - "modified": "2021-06-29 18:26:07.094851", + "modified": "2024-01-16 13:19:22.365362", "modified_by": "Administrator", "module": "Integrations", "name": "Google Settings", @@ -96,5 +95,6 @@ "quick_entry": 1, "sort_field": "modified", "sort_order": "ASC", + "states": [], "track_changes": 1 } \ No newline at end of file diff --git a/frappe/integrations/doctype/google_settings/google_settings.py b/frappe/integrations/doctype/google_settings/google_settings.py index a5b2a919ed..d69ae79572 100644 --- a/frappe/integrations/doctype/google_settings/google_settings.py +++ b/frappe/integrations/doctype/google_settings/google_settings.py @@ -21,6 +21,7 @@ class GoogleSettings(Document): enable: DF.Check google_drive_picker_enabled: DF.Check # end: auto-generated types + pass @@ -34,6 +35,5 @@ def get_file_picker_settings(): return { "enabled": True, "appId": google_settings.app_id, - "developerKey": google_settings.api_key, "clientId": google_settings.client_id, } diff --git a/frappe/integrations/doctype/google_settings/test_google_settings.py b/frappe/integrations/doctype/google_settings/test_google_settings.py index d4bb830779..4b705a67f1 100644 --- a/frappe/integrations/doctype/google_settings/test_google_settings.py +++ b/frappe/integrations/doctype/google_settings/test_google_settings.py @@ -40,4 +40,3 @@ class TestGoogleSettings(FrappeTestCase): self.assertEqual(True, settings.get("enabled", False)) self.assertEqual("test_client_id", settings.get("clientId", "")) self.assertEqual("test_app_id", settings.get("appId", "")) - self.assertEqual("test_api_key", settings.get("developerKey", "")) diff --git a/frappe/public/js/integrations/google_drive_picker.js b/frappe/public/js/integrations/google_drive_picker.js index 4564e98de9..ba556514fa 100644 --- a/frappe/public/js/integrations/google_drive_picker.js +++ b/frappe/public/js/integrations/google_drive_picker.js @@ -1,12 +1,11 @@ /* global gapi:false, google:false */ export default class GoogleDrivePicker { - constructor({ pickerCallback, enabled, appId, developerKey, clientId } = {}) { + constructor({ pickerCallback, enabled, appId, clientId } = {}) { this.scope = "https://www.googleapis.com/auth/drive.file"; this.pickerApiLoaded = false; this.enabled = enabled; this.appId = appId; this.pickerCallback = pickerCallback; - this.developerKey = developerKey; this.clientId = clientId; } @@ -45,7 +44,6 @@ export default class GoogleDrivePicker { createPicker(access_token) { this.view = new google.picker.View(google.picker.ViewId.DOCS); this.picker = new google.picker.PickerBuilder() - .setDeveloperKey(this.developerKey) .setAppId(this.appId) .setOAuthToken(access_token) .addView(this.view)