Skip to content

Commit a3690ff

Browse files
santipalenquesantipalenque
committed
[spalenque] - #14412 * add google api key to js maps api includes
1 parent ae5f3e4 commit a3690ff

6 files changed

Lines changed: 19 additions & 9 deletions

File tree

‎jobs/code/ui/admin/SangriaPageJobsExtension.php‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,8 @@ public function getPostedJobsCount(){
8181

8282
function JobRegistrationRequestForm(){
8383
$this->commonScripts();
84-
Requirements::javascript(Director::protocol()."maps.googleapis.com/maps/api/js?sensor=false");
84+
$google_map_lib_url = sprintf("https://maps.googleapis.com/maps/api/js?key=%s&sensor=false", GOOGLE_MAP_KEY);
85+
Requirements::javascript($google_map_lib_url);
8586
Requirements::javascript("marketplace/code/ui/admin/js/geocoding.jquery.js");
8687
Requirements::css('jobs/css/job.registration.form.css');
8788
Requirements::javascript("jobs/js/job.registration.form.js");
@@ -100,7 +101,8 @@ function JobRegistrationRequestForm(){
100101

101102
function JobForm(){
102103
$this->commonScripts();
103-
Requirements::javascript(Director::protocol()."maps.googleapis.com/maps/api/js?sensor=false");
104+
$google_map_lib_url = sprintf("https://maps.googleapis.com/maps/api/js?key=%s&sensor=false", GOOGLE_MAP_KEY);
105+
Requirements::javascript($google_map_lib_url);
104106
Requirements::javascript("marketplace/code/ui/admin/js/geocoding.jquery.js");
105107
Requirements::css('jobs/css/job.registration.form.css');
106108
Requirements::javascript("jobs/js/job.registration.form.js");

‎jobs/code/ui/frontend/JobPage_Controller.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ function init() {
4141
Requirements::javascript(THIRDPARTY_DIR . '/jquery-ui/jquery-ui.js');
4242
JSChosenDependencies::renderRequirements();
4343
JQueryValidateDependencies::renderRequirements();
44-
Requirements::javascript(Director::protocol()."maps.googleapis.com/maps/api/js?sensor=false");
44+
$google_map_lib_url = sprintf("https://maps.googleapis.com/maps/api/js?key=%s&sensor=false", GOOGLE_MAP_KEY);
45+
Requirements::javascript($google_map_lib_url);
4546
Requirements::javascript("marketplace/code/ui/admin/js/geocoding.jquery.js");
4647
Requirements::javascript("marketplace/code/ui/admin/js/utils.js");
4748
Requirements::javascript('node_modules/pure/libs/pure.min.js');

‎jobs/code/ui/frontend/JobRegistrationRequestPage.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ function init() {
5151
JSChosenDependencies::renderRequirements();
5252
JQueryValidateDependencies::renderRequirements();
5353

54-
Requirements::javascript(Director::protocol()."maps.googleapis.com/maps/api/js?sensor=false");
54+
$google_map_lib_url = sprintf("https://maps.googleapis.com/maps/api/js?key=%s&sensor=false", GOOGLE_MAP_KEY);
55+
Requirements::javascript($google_map_lib_url);
5556

5657
$js_files = [
5758
"marketplace/code/ui/admin/js/geocoding.jquery.js",

‎marketplace/code/ui/admin/MarketPlaceAdminPage.php‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -549,7 +549,8 @@ public function public_cloud()
549549
Requirements::javascript('marketplace/code/ui/admin/js/pricing.schemas.js');
550550
Requirements::javascript('marketplace/code/ui/admin/js/datacenter.locations.js');
551551
Requirements::javascript('marketplace/code/ui/admin/js/marketplace.type.header.js');
552-
Requirements::javascript(Director::protocol() . "maps.googleapis.com/maps/api/js?sensor=false");
552+
$google_map_lib_url = sprintf("https://maps.googleapis.com/maps/api/js?key=%s&sensor=false", GOOGLE_MAP_KEY);
553+
Requirements::javascript($google_map_lib_url);
553554
Requirements::javascript('marketplace/code/ui/admin/js/geocoding.jquery.js');
554555
HtmlEditorField::include_js();
555556
Requirements::javascript('marketplace/code/ui/admin/js/public_cloud.js');
@@ -570,7 +571,8 @@ public function private_cloud()
570571
Requirements::javascript('marketplace/code/ui/admin/js/pricing.schemas.js');
571572
Requirements::javascript('marketplace/code/ui/admin/js/datacenter.locations.js');
572573
Requirements::javascript('marketplace/code/ui/admin/js/marketplace.type.header.js');
573-
Requirements::javascript(Director::protocol() . "maps.googleapis.com/maps/api/js?sensor=false");
574+
$google_map_lib_url = sprintf("https://maps.googleapis.com/maps/api/js?key=%s&sensor=false", GOOGLE_MAP_KEY);
575+
Requirements::javascript($google_map_lib_url);
574576
Requirements::javascript('marketplace/code/ui/admin/js/geocoding.jquery.js');
575577
HtmlEditorField::include_js();
576578
Requirements::javascript('marketplace/code/ui/admin/js/private_cloud.js');
@@ -608,7 +610,8 @@ public function consultant()
608610
Requirements::javascript('marketplace/code/ui/admin/js/spoken.languages.js');
609611
Requirements::javascript('marketplace/code/ui/admin/js/offices.js');
610612
Requirements::javascript('marketplace/code/ui/admin/js/marketplace.type.header.js');
611-
Requirements::javascript(Director::protocol() . "maps.googleapis.com/maps/api/js?sensor=false");
613+
$google_map_lib_url = sprintf("https://maps.googleapis.com/maps/api/js?key=%s&sensor=false", GOOGLE_MAP_KEY);
614+
Requirements::javascript($google_map_lib_url);
612615
Requirements::javascript('marketplace/code/ui/admin/js/geocoding.jquery.js');
613616
Requirements::javascript('marketplace/code/ui/admin/js/consultant.js');
614617
return $this->getViewer('consultant')->process($this);

‎summit/code/pages/SummitAppVenuesPage.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,9 @@ public function init()
2929

3030
Requirements::javascript('themes/openstack/javascript/urlfragment.jquery.js');
3131
Requirements::css("summit/css/summitapp-venues.css");
32-
Requirements::javascript('https://maps.googleapis.com/maps/api/js?v=3.exp');
32+
33+
$google_map_lib_url = sprintf("https://maps.googleapis.com/maps/api/js?key=%s&v=3.exp", GOOGLE_MAP_KEY);
34+
Requirements::javascript($google_map_lib_url);
3335
Requirements::javascript('summit/javascript/summitapp-venues.js');
3436
}
3537

‎summit/code/pages/SummitLocationPage.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,8 @@ public function init()
389389
Requirements::css('themes/openstack/javascript/secondary-nav.jquery/secondary-nav.jquery.css');
390390
Requirements::javascript('themes/openstack/javascript/secondary-nav.jquery/secondary-nav.jquery.js');
391391
if (empty($this->CampusGraphic)) {
392-
Requirements::javascript('https://maps.googleapis.com/maps/api/js?v=3.exp');
392+
$google_map_lib_url = sprintf("https://maps.googleapis.com/maps/api/js?key=%s&v=3.exp", GOOGLE_MAP_KEY);
393+
Requirements::javascript($google_map_lib_url);
393394
Requirements::javascript("summit/javascript/host-city-map.js");
394395
Requirements::customScript($this->MapScript());
395396
}

0 commit comments

Comments
 (0)