pass api key

This commit is contained in:
j 2017-06-09 09:34:41 +02:00
parent ae3afc93c3
commit ac1a567fa4
3 changed files with 3 additions and 0 deletions

View file

@ -76,6 +76,7 @@ def load_config(init=False):
settings.SERVER_EMAIL = config['site']['email']['system'] settings.SERVER_EMAIL = config['site']['email']['system']
config['site']['videoprefix'] = settings.VIDEO_PREFIX config['site']['videoprefix'] = settings.VIDEO_PREFIX
config['site']['mediaprefix'] = settings.MEDIA_PREFIX config['site']['mediaprefix'] = settings.MEDIA_PREFIX
config['site']['googleapikey'] = getattr(settings, 'GOOGLE_API_KEY')
config['site']['version'] = get_version() config['site']['version'] = get_version()
config['site']['dontValidateUser'] = not settings.AUTH_CHECK_USERNAME config['site']['dontValidateUser'] = not settings.AUTH_CHECK_USERNAME
if not 'folderdepth' in config['site']: if not 'folderdepth' in config['site']:

View file

@ -122,6 +122,7 @@ pandora.ui.navigationView = function(type, videoRatio) {
that.replaceElement(0, that.replaceElement(0,
$element = Ox.Map({ $element = Ox.Map({
apiKey: pandora.site.site.googleapikey,
// clickable: pandora.site.capabilities.canClickMap[pandora.user.level], // clickable: pandora.site.capabilities.canClickMap[pandora.user.level],
find: ui.mapFind, find: ui.mapFind,
// 20 px menu + 24 px toolbar + 1px resizbar + 16px statusbar (if !item) // 20 px menu + 24 px toolbar + 1px resizbar + 16px statusbar (if !item)

View file

@ -13,6 +13,7 @@ pandora.ui.placesDialog = function(options) {
callback(result); callback(result);
}); });
}, },
apiKey: pandora.site.site.googleapikey,
editPlace: function(place, callback) { editPlace: function(place, callback) {
pandora.api.editPlace(place, function(result) { pandora.api.editPlace(place, function(result) {
Ox.Request.clearCache(); // fixme: remove Ox.Request.clearCache(); // fixme: remove