From ac1a567fa43c4801f9f375bd104fdedb7d1fad99 Mon Sep 17 00:00:00 2001 From: j Date: Fri, 9 Jun 2017 09:34:41 +0200 Subject: [PATCH] pass api key --- pandora/app/config.py | 1 + static/js/navigationView.js | 1 + static/js/placesDialog.js | 1 + 3 files changed, 3 insertions(+) diff --git a/pandora/app/config.py b/pandora/app/config.py index e2e4ffbc..1f075955 100644 --- a/pandora/app/config.py +++ b/pandora/app/config.py @@ -76,6 +76,7 @@ def load_config(init=False): settings.SERVER_EMAIL = config['site']['email']['system'] config['site']['videoprefix'] = settings.VIDEO_PREFIX config['site']['mediaprefix'] = settings.MEDIA_PREFIX + config['site']['googleapikey'] = getattr(settings, 'GOOGLE_API_KEY') config['site']['version'] = get_version() config['site']['dontValidateUser'] = not settings.AUTH_CHECK_USERNAME if not 'folderdepth' in config['site']: diff --git a/static/js/navigationView.js b/static/js/navigationView.js index 86328306..4a3c015b 100644 --- a/static/js/navigationView.js +++ b/static/js/navigationView.js @@ -122,6 +122,7 @@ pandora.ui.navigationView = function(type, videoRatio) { that.replaceElement(0, $element = Ox.Map({ + apiKey: pandora.site.site.googleapikey, // clickable: pandora.site.capabilities.canClickMap[pandora.user.level], find: ui.mapFind, // 20 px menu + 24 px toolbar + 1px resizbar + 16px statusbar (if !item) diff --git a/static/js/placesDialog.js b/static/js/placesDialog.js index b270803f..676636a1 100644 --- a/static/js/placesDialog.js +++ b/static/js/placesDialog.js @@ -13,6 +13,7 @@ pandora.ui.placesDialog = function(options) { callback(result); }); }, + apiKey: pandora.site.site.googleapikey, editPlace: function(place, callback) { pandora.api.editPlace(place, function(result) { Ox.Request.clearCache(); // fixme: remove