|
7 | 7 | use EdgarIndustries\ElementalMap\Provider\Here;
|
8 | 8 | use EdgarIndustries\ElementalMap\Provider\HereHybrid;
|
9 | 9 | use EdgarIndustries\ElementalMap\Provider\Mapbox;
|
10 |
| -use SilverStripe\Control\Director; |
11 | 10 | use SilverStripe\Core\Injector\Injector;
|
12 | 11 | use SilverStripe\Forms\DropdownField;
|
13 | 12 | use SilverStripe\Forms\FieldGroup;
|
| 13 | +use SilverStripe\Forms\FieldList; |
14 | 14 | use SilverStripe\Forms\GridField\GridField;
|
15 | 15 | use SilverStripe\Forms\GridField\GridFieldConfig_RelationEditor;
|
16 | 16 | use SilverStripe\Forms\LiteralField;
|
@@ -56,51 +56,52 @@ class MapBlock extends BaseElement
|
56 | 56 |
|
57 | 57 | public function getCMSFields()
|
58 | 58 | {
|
59 |
| - $fields = parent::getCMSFields(); |
60 |
| - |
61 |
| - $fields->removeByName([ |
62 |
| - 'Provider', |
63 |
| - 'ProviderVariant', |
64 |
| - 'DefaultLatitude', |
65 |
| - 'DefaultLongitude', |
66 |
| - 'DefaultZoom', |
67 |
| - 'LinkTracking', |
68 |
| - 'FileTracking', |
69 |
| - 'Markers', |
70 |
| - 'Height', |
71 |
| - 'Width', |
72 |
| - ]); |
73 |
| - |
74 |
| - $currentProvider = class_exists($this->Provider) ? Injector::inst()->create($this->Provider) : null; |
| 59 | + $this->beforeUpdateCMSFields(function (FieldList $fields) { |
| 60 | + |
| 61 | + $fields->removeByName([ |
| 62 | + 'Provider', |
| 63 | + 'ProviderVariant', |
| 64 | + 'DefaultLatitude', |
| 65 | + 'DefaultLongitude', |
| 66 | + 'DefaultZoom', |
| 67 | + 'LinkTracking', |
| 68 | + 'FileTracking', |
| 69 | + 'Markers', |
| 70 | + 'Height', |
| 71 | + 'Width', |
| 72 | + ]); |
75 | 73 |
|
76 |
| - $providers = ArrayList::create(); |
77 |
| - foreach ($this->config()->get('providers') as $providerClass) { |
78 |
| - $provider = Injector::inst()->create($providerClass); |
79 |
| - $providers->push((object) ['ID' => $providerClass, 'Title' => $provider->getTitle()]); |
80 |
| - } |
| 74 | + $currentProvider = class_exists($this->Provider) ? Injector::inst()->create($this->Provider) : null; |
81 | 75 |
|
82 |
| - $fields->addFieldsToTab('Root.Main', [ |
83 |
| - DropdownField::create('Provider', 'Tiles', $providers->sort('Title')->map()), |
84 |
| - FieldGroup::create( |
85 |
| - 'Centre', |
86 |
| - NumericField::create('DefaultLatitude', 'Latitude')->setScale(6), |
87 |
| - NumericField::create('DefaultLongitude', 'Longitude')->setScale(6), |
88 |
| - TextField::create('DefaultZoom', 'Zoom') |
89 |
| - ), |
90 |
| - FieldGroup::create( |
91 |
| - 'Size', |
92 |
| - NumericField::create('Height'), |
93 |
| - NumericField::create('Width', 'Width (optional)') |
94 |
| - ), |
95 |
| - LiteralField::create('MarkersPadding', '<p style="height: 25px"> </p>'), |
96 |
| - GridField::create( |
97 |
| - 'Markers', |
98 |
| - 'Markers', |
99 |
| - $this->Markers() |
100 |
| - )->setConfig(GridFieldConfig_RelationEditor::create()), |
101 |
| - ]); |
| 76 | + $providers = ArrayList::create(); |
| 77 | + foreach ($this->config()->get('providers') as $providerClass) { |
| 78 | + $provider = Injector::inst()->create($providerClass); |
| 79 | + $providers->push((object)['ID' => $providerClass, 'Title' => $provider->getTitle()]); |
| 80 | + } |
102 | 81 |
|
103 |
| - return $fields; |
| 82 | + $fields->addFieldsToTab('Root.Main', [ |
| 83 | + DropdownField::create('Provider', 'Tiles', $providers->sort('Title')->map()), |
| 84 | + FieldGroup::create( |
| 85 | + 'Centre', |
| 86 | + NumericField::create('DefaultLatitude', 'Latitude')->setScale(6), |
| 87 | + NumericField::create('DefaultLongitude', 'Longitude')->setScale(6), |
| 88 | + TextField::create('DefaultZoom', 'Zoom') |
| 89 | + ), |
| 90 | + FieldGroup::create( |
| 91 | + 'Size', |
| 92 | + NumericField::create('Height'), |
| 93 | + NumericField::create('Width', 'Width (optional)') |
| 94 | + ), |
| 95 | + LiteralField::create('MarkersPadding', '<p style="height: 25px"> </p>'), |
| 96 | + GridField::create( |
| 97 | + 'Markers', |
| 98 | + 'Markers', |
| 99 | + $this->Markers() |
| 100 | + )->setConfig(GridFieldConfig_RelationEditor::create()), |
| 101 | + ]); |
| 102 | + }); |
| 103 | + |
| 104 | + return parent::getCMSFields(); |
104 | 105 | }
|
105 | 106 |
|
106 | 107 | public function getLeafletParams()
|
@@ -137,7 +138,9 @@ public function validate()
|
137 | 138 | $invalid = false;
|
138 | 139 |
|
139 | 140 | foreach ($providerAuth as $key) {
|
140 |
| - if (empty($siteconfig->$key)) $invalid = true; |
| 141 | + if (empty($siteconfig->$key)) { |
| 142 | + $invalid = true; |
| 143 | + } |
141 | 144 | }
|
142 | 145 |
|
143 | 146 | if ($invalid) {
|
|
0 commit comments