Revert "Update Google API Settings in System Settings - resolves #3360"

This reverts commit 9d3d26f
pimcore · Nov 21, 2018 · 1893c05 · 1893c05
1 parent ca3b61e
commit 1893c05
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/.travis/system.template.php b/.travis/system.template.php
@@ -70,7 +70,8 @@
         "google" => [
             "client_id"     => "",
             "email"         => "",
-            "simpleapikey"  => ""
+            "simpleapikey"  => "",
+            "browserapikey" => ""
         ]
     ],
     "cache"          => [

diff --git a/bundles/AdminBundle/Controller/Admin/SettingsController.php b/bundles/AdminBundle/Controller/Admin/SettingsController.php
@@ -504,6 +504,7 @@ public function setSystemAction(Request $request)
                     'client_id' => $values['services.google.client_id'],
                     'email' => $values['services.google.email'],
                     'simpleapikey' => $values['services.google.simpleapikey'],
+                    'browserapikey' => $values['services.google.browserapikey']
                 ]
             ],
             'cache' => [

diff --git a/bundles/AdminBundle/Resources/public/js/pimcore/settings/system.js b/bundles/AdminBundle/Resources/public/js/pimcore/settings/system.js
@@ -957,10 +957,16 @@ pimcore.settings.system = Class.create({
                                 cls: "pimcore_extra_label"
                             },
                             {
-                                fieldLabel: t('api_key'),
+                                fieldLabel: t('server_api_key'),
                                 name: 'services.google.simpleapikey',
                                 value: this.getValue("services.google.simpleapikey"),
                                 width: 850
+                            },
+                            {
+                                fieldLabel: t('browser_api_key'),
+                                name: 'services.google.browserapikey',
+                                value: this.getValue("services.google.browserapikey"),
+                                width: 850
                             }
                         ]
                     }

diff --git a/bundles/CoreBundle/Resources/translations/en.extended.json b/bundles/CoreBundle/Resources/translations/en.extended.json
@@ -128,7 +128,8 @@
   "debug_admin_translations": "Debug Admin-Translations (wrapped in +)",
   "short_url": "Short URL",
   "width_and_height_must_be_an_even_number": "width and height must be an even number",
-  "api_key": "API-Key",
+  "server_api_key": "Server API-Key",
+  "browser_api_key": "Browser API-Key",
   "source_site": "Source-Site",
   "target_site": "Target-Site",
   "source_entire_url": "Entire URL as Source",

diff --git a/...cumentation/23_Installation_and_Upgrade/09_Upgrade_Notes/01_Within_V5/README.md b/...cumentation/23_Installation_and_Upgrade/09_Upgrade_Notes/01_Within_V5/README.md
@@ -9,15 +9,6 @@ For version 6 use the `DefaultElasticSearch6` worker / product list.
 
 ## Version 5.5.1
 
-#### Removed Google Maps Browser API Key from System Settings
-Google is now providing just one keys for both server-side and client-side applications, there's no need 
-anymore to seperate them out. 
-If you're accessing the following config option `$config->serivces->google->browserapikey` somewhere in your application
-please change it to `$config->serivces->google->simpleapikey` before you upgrade and ensure that the API key
-is correctly permissioned. 
-
-## Version 5.5.1
-
 #### WebP Support for Thumbnails
 Pimcore now delivers automatically thumbnails in WebP format when using the `Auto` configuration for the 
 target format and when the client does support WebP (checking by evaluating the `Accept` request header).