Commit 3712497c authored by itamair's avatar itamair
Browse files

fixes to GeofieldGoogleMapViewStyle, EntityTypeThemer & MarkerIconService

parent 17cb48a3
......@@ -265,7 +265,7 @@ class MarkerIconService {
*/
public function getFileUploadHelp() {
return [
'#type' => 'container',
'#type' => 'html_tag',
'#tag' => 'div',
'file_upload_help' => [
'#theme' => 'file_upload_help',
......@@ -354,7 +354,7 @@ class MarkerIconService {
* The image style identifier.
*
* @return string
* The icon preview element.
* The url path to the file id (image style).
*/
public function getFileManagedUrl($fid = NULL, $image_style = 'none') {
if (isset($fid) && $file = File::load($fid)) {
......
......@@ -102,7 +102,7 @@ class EntityTypeThemer extends MapThemerBase {
// Get the View Filtered entity bundles.
$entity_type = $geofieldMapView->getViewEntityType();
$entity_bundles = $this->entityTypeBundleInfo->getBundleInfo($entity_type);
$view_bundles = !empty($geofieldMapView->getViewFilteredBundles()) ? $geofieldMapView->getViewFilteredBundles() : array_keys($entity_bundles);
$view_bundles = !empty($geofieldMapView->getViewFilteredBundles()) ? array_intersect(array_keys($entity_bundles), $geofieldMapView->getViewFilteredBundles()) : array_keys($entity_bundles);
// Reorder the entity bundles based on existing (Default) Element settings.
if (!empty($default_element)) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment