@@ -23,7 +23,7 @@ |
||
23 | 23 | public function testGetCoords() |
24 | 24 | { |
25 | 25 | $location = $this->objFromFixture(Location::class, 'dynamic'); |
26 | - $coords = ((int)$location->Lat != 0 && (int)$location->Lng != 0) ? 'true' : 'false'; |
|
26 | + $coords = ((int) $location->Lat != 0 && (int) $location->Lng != 0) ? 'true' : 'false'; |
|
27 | 27 | $this->assertEquals($coords, $location->getCoords()); |
28 | 28 | } |
29 | 29 |
@@ -18,206 +18,206 @@ |
||
18 | 18 | */ |
19 | 19 | class LocationTest extends SapphireTest |
20 | 20 | { |
21 | - /** |
|
22 | - * @var string |
|
23 | - */ |
|
24 | - protected static $fixture_file = '../fixtures.yml'; |
|
25 | - |
|
26 | - /** |
|
27 | - * @var array |
|
28 | - */ |
|
29 | - protected static $extra_dataobjects = [ |
|
30 | - ExtendedLocation::class, |
|
31 | - ]; |
|
32 | - |
|
33 | - /** |
|
34 | - * @var array |
|
35 | - */ |
|
36 | - protected static $required_extensions = [ |
|
37 | - ExtendedLocation::class => [ |
|
38 | - LocationExtension::class, |
|
39 | - ], |
|
40 | - ]; |
|
41 | - |
|
42 | - /** |
|
43 | - * |
|
44 | - */ |
|
45 | - public function testGetCoords() |
|
46 | - { |
|
47 | - $location = $this->objFromFixture(Location::class, 'dynamic'); |
|
48 | - $coords = ((int)$location->Lat != 0 && (int)$location->Lng != 0) ? 'true' : 'false'; |
|
49 | - $this->assertEquals($coords, $location->getCoords()); |
|
50 | - } |
|
51 | - |
|
52 | - /** |
|
53 | - * |
|
54 | - */ |
|
55 | - public function testFieldLabels() |
|
56 | - { |
|
57 | - $this->markTestSkipped(); |
|
58 | - // Link and File tracking display as "Tracking" in SS 4.2 & 4.3, "Tracking" in 4.4 |
|
59 | - $location = $this->objFromFixture(Location::class, 'dynamic'); |
|
60 | - $labels = $location->FieldLabels(); |
|
61 | - $expected = [ |
|
62 | - 'Title' => 'Name', |
|
63 | - 'Featured' => 'Featured', |
|
64 | - 'Website' => 'Website', |
|
65 | - 'Phone' => 'Phone', |
|
66 | - 'Email' => 'Email', |
|
67 | - 'Fax' => 'Fax', |
|
68 | - 'Address' => 'Address', |
|
69 | - 'City' => 'City', |
|
70 | - 'State' => 'State', |
|
71 | - 'PostalCode' => 'Postal Code', |
|
72 | - 'Country' => 'Country', |
|
73 | - 'Lat' => 'Lat', |
|
74 | - 'Lng' => 'Lng', |
|
75 | - 'Categories' => 'Categories', |
|
76 | - 'Category.Name' => 'Category', |
|
77 | - 'Category.ID' => 'Category', |
|
78 | - 'Featured.NiceAsBoolean' => 'Featured', |
|
79 | - 'Import_ID' => 'Import_ID', |
|
80 | - 'Version' => 'Version', |
|
81 | - 'Versions' => 'Versions', |
|
82 | - 'Address2' => 'Address2', |
|
83 | - 'LinkTracking' => 'Link tracking', |
|
84 | - 'FileTracking' => 'File tracking', |
|
85 | - ]; |
|
86 | - $this->assertEquals($expected, $labels); |
|
87 | - } |
|
88 | - |
|
89 | - /** |
|
90 | - * |
|
91 | - */ |
|
92 | - public function testGetCMSFields() |
|
93 | - { |
|
94 | - $object = new Location(); |
|
95 | - $fieldset = $object->getCMSFields(); |
|
96 | - $this->assertinstanceOf(FieldList::class, $fieldset); |
|
97 | - } |
|
98 | - |
|
99 | - /** |
|
100 | - * |
|
101 | - */ |
|
102 | - public function testCanView() |
|
103 | - { |
|
104 | - $object = $this->objFromFixture(Location::class, 'dynamic'); |
|
105 | - $object->write(); |
|
106 | - |
|
107 | - $this->assertTrue($object->canView()); |
|
108 | - |
|
109 | - $nullMember = Member::create(); |
|
110 | - $nullMember->write(); |
|
111 | - |
|
112 | - $this->assertTrue($object->canView($nullMember)); |
|
113 | - |
|
114 | - $nullMember->delete(); |
|
115 | - } |
|
116 | - |
|
117 | - /** |
|
118 | - * |
|
119 | - */ |
|
120 | - public function testCanEdit() |
|
121 | - { |
|
122 | - $object = $this->objFromFixture(Location::class, 'dynamic'); |
|
123 | - $object->write(); |
|
124 | - |
|
125 | - $objectID = $object->ID; |
|
126 | - |
|
127 | - //test permissions per permission setting |
|
128 | - $create = $this->objFromFixture(Member::class, 'locationcreate'); |
|
129 | - $edit = $this->objFromFixture(Member::class, 'locationedit'); |
|
130 | - $delete = $this->objFromFixture(Member::class, 'locationdelete'); |
|
131 | - |
|
132 | - $originalTitle = $object->Title; |
|
133 | - $this->assertEquals($originalTitle, 'Dynamic, Inc.'); |
|
134 | - |
|
135 | - $this->assertTrue($object->canEdit($edit)); |
|
136 | - $this->assertFalse($object->canEdit($create)); |
|
137 | - $this->assertFalse($object->canEdit($delete)); |
|
138 | - |
|
139 | - $object->Title = 'Changed Title'; |
|
140 | - $object->write(); |
|
141 | - |
|
142 | - $testEdit = Location::get()->byID($objectID); |
|
143 | - $this->assertEquals($testEdit->Title, 'Changed Title'); |
|
144 | - } |
|
145 | - |
|
146 | - /** |
|
147 | - * |
|
148 | - */ |
|
149 | - public function testCanDelete() |
|
150 | - { |
|
151 | - $object = $this->objFromFixture(Location::class, 'dynamic'); |
|
152 | - $object->write(); |
|
153 | - |
|
154 | - //test permissions per permission setting |
|
155 | - $create = $this->objFromFixture(Member::class, 'locationcreate'); |
|
156 | - $edit = $this->objFromFixture(Member::class, 'locationedit'); |
|
157 | - $delete = $this->objFromFixture(Member::class, 'locationdelete'); |
|
158 | - |
|
159 | - $this->assertTrue($object->canDelete($delete)); |
|
160 | - $this->assertFalse($object->canDelete($create)); |
|
161 | - $this->assertFalse($object->canDelete($edit)); |
|
162 | - |
|
163 | - $checkObject = $object; |
|
164 | - $object->delete(); |
|
165 | - |
|
166 | - $this->assertEquals($checkObject->ID, 0); |
|
167 | - } |
|
168 | - |
|
169 | - /** |
|
170 | - * |
|
171 | - */ |
|
172 | - public function testCanCreate() |
|
173 | - { |
|
174 | - $object = singleton(Location::class); |
|
175 | - |
|
176 | - //test permissions per permission setting |
|
177 | - $create = $this->objFromFixture(Member::class, 'locationcreate'); |
|
178 | - $edit = $this->objFromFixture(Member::class, 'locationedit'); |
|
179 | - $delete = $this->objFromFixture(Member::class, 'locationdelete'); |
|
180 | - |
|
181 | - $this->assertTrue($object->canCreate($create)); |
|
182 | - $this->assertFalse($object->canCreate($edit)); |
|
183 | - $this->assertFalse($object->canCreate($delete)); |
|
184 | - |
|
185 | - $nullMember = Member::create(); |
|
186 | - $nullMember->write(); |
|
187 | - $this->assertFalse($object->canCreate($nullMember)); |
|
188 | - |
|
189 | - $nullMember->delete(); |
|
190 | - } |
|
191 | - |
|
192 | - /** |
|
193 | - * |
|
194 | - */ |
|
195 | - public function testProvidePermissions() |
|
196 | - { |
|
197 | - $object = Location::create(); |
|
198 | - $expected = [ |
|
199 | - 'Location_EDIT' => 'Edit a Location', |
|
200 | - 'Location_DELETE' => 'Delete a Location', |
|
201 | - 'Location_CREATE' => 'Create a Location', |
|
202 | - ]; |
|
203 | - $this->assertEquals($expected, $object->providePermissions()); |
|
204 | - } |
|
205 | - |
|
206 | - /** |
|
207 | - * |
|
208 | - */ |
|
209 | - public function testUpdateWebsiteURL() |
|
210 | - { |
|
211 | - $location = $this->objFromFixture(Location::class, 'dynamic'); |
|
212 | - |
|
213 | - // Create unsaved raw duplicate |
|
214 | - $map = $location->toMap(); |
|
215 | - unset($map['Created']); |
|
216 | - /** @var static $clone */ |
|
217 | - $clone = Injector::inst()->create(ExtendedLocation::class, $map); |
|
218 | - $clone->ID = 0; |
|
219 | - |
|
220 | - $this->assertEquals('http://www.dynamicagency.com', $location->getWebsiteURL()); |
|
221 | - $this->assertEquals('foo', $clone->getWebsiteURL()); |
|
222 | - } |
|
21 | + /** |
|
22 | + * @var string |
|
23 | + */ |
|
24 | + protected static $fixture_file = '../fixtures.yml'; |
|
25 | + |
|
26 | + /** |
|
27 | + * @var array |
|
28 | + */ |
|
29 | + protected static $extra_dataobjects = [ |
|
30 | + ExtendedLocation::class, |
|
31 | + ]; |
|
32 | + |
|
33 | + /** |
|
34 | + * @var array |
|
35 | + */ |
|
36 | + protected static $required_extensions = [ |
|
37 | + ExtendedLocation::class => [ |
|
38 | + LocationExtension::class, |
|
39 | + ], |
|
40 | + ]; |
|
41 | + |
|
42 | + /** |
|
43 | + * |
|
44 | + */ |
|
45 | + public function testGetCoords() |
|
46 | + { |
|
47 | + $location = $this->objFromFixture(Location::class, 'dynamic'); |
|
48 | + $coords = ((int)$location->Lat != 0 && (int)$location->Lng != 0) ? 'true' : 'false'; |
|
49 | + $this->assertEquals($coords, $location->getCoords()); |
|
50 | + } |
|
51 | + |
|
52 | + /** |
|
53 | + * |
|
54 | + */ |
|
55 | + public function testFieldLabels() |
|
56 | + { |
|
57 | + $this->markTestSkipped(); |
|
58 | + // Link and File tracking display as "Tracking" in SS 4.2 & 4.3, "Tracking" in 4.4 |
|
59 | + $location = $this->objFromFixture(Location::class, 'dynamic'); |
|
60 | + $labels = $location->FieldLabels(); |
|
61 | + $expected = [ |
|
62 | + 'Title' => 'Name', |
|
63 | + 'Featured' => 'Featured', |
|
64 | + 'Website' => 'Website', |
|
65 | + 'Phone' => 'Phone', |
|
66 | + 'Email' => 'Email', |
|
67 | + 'Fax' => 'Fax', |
|
68 | + 'Address' => 'Address', |
|
69 | + 'City' => 'City', |
|
70 | + 'State' => 'State', |
|
71 | + 'PostalCode' => 'Postal Code', |
|
72 | + 'Country' => 'Country', |
|
73 | + 'Lat' => 'Lat', |
|
74 | + 'Lng' => 'Lng', |
|
75 | + 'Categories' => 'Categories', |
|
76 | + 'Category.Name' => 'Category', |
|
77 | + 'Category.ID' => 'Category', |
|
78 | + 'Featured.NiceAsBoolean' => 'Featured', |
|
79 | + 'Import_ID' => 'Import_ID', |
|
80 | + 'Version' => 'Version', |
|
81 | + 'Versions' => 'Versions', |
|
82 | + 'Address2' => 'Address2', |
|
83 | + 'LinkTracking' => 'Link tracking', |
|
84 | + 'FileTracking' => 'File tracking', |
|
85 | + ]; |
|
86 | + $this->assertEquals($expected, $labels); |
|
87 | + } |
|
88 | + |
|
89 | + /** |
|
90 | + * |
|
91 | + */ |
|
92 | + public function testGetCMSFields() |
|
93 | + { |
|
94 | + $object = new Location(); |
|
95 | + $fieldset = $object->getCMSFields(); |
|
96 | + $this->assertinstanceOf(FieldList::class, $fieldset); |
|
97 | + } |
|
98 | + |
|
99 | + /** |
|
100 | + * |
|
101 | + */ |
|
102 | + public function testCanView() |
|
103 | + { |
|
104 | + $object = $this->objFromFixture(Location::class, 'dynamic'); |
|
105 | + $object->write(); |
|
106 | + |
|
107 | + $this->assertTrue($object->canView()); |
|
108 | + |
|
109 | + $nullMember = Member::create(); |
|
110 | + $nullMember->write(); |
|
111 | + |
|
112 | + $this->assertTrue($object->canView($nullMember)); |
|
113 | + |
|
114 | + $nullMember->delete(); |
|
115 | + } |
|
116 | + |
|
117 | + /** |
|
118 | + * |
|
119 | + */ |
|
120 | + public function testCanEdit() |
|
121 | + { |
|
122 | + $object = $this->objFromFixture(Location::class, 'dynamic'); |
|
123 | + $object->write(); |
|
124 | + |
|
125 | + $objectID = $object->ID; |
|
126 | + |
|
127 | + //test permissions per permission setting |
|
128 | + $create = $this->objFromFixture(Member::class, 'locationcreate'); |
|
129 | + $edit = $this->objFromFixture(Member::class, 'locationedit'); |
|
130 | + $delete = $this->objFromFixture(Member::class, 'locationdelete'); |
|
131 | + |
|
132 | + $originalTitle = $object->Title; |
|
133 | + $this->assertEquals($originalTitle, 'Dynamic, Inc.'); |
|
134 | + |
|
135 | + $this->assertTrue($object->canEdit($edit)); |
|
136 | + $this->assertFalse($object->canEdit($create)); |
|
137 | + $this->assertFalse($object->canEdit($delete)); |
|
138 | + |
|
139 | + $object->Title = 'Changed Title'; |
|
140 | + $object->write(); |
|
141 | + |
|
142 | + $testEdit = Location::get()->byID($objectID); |
|
143 | + $this->assertEquals($testEdit->Title, 'Changed Title'); |
|
144 | + } |
|
145 | + |
|
146 | + /** |
|
147 | + * |
|
148 | + */ |
|
149 | + public function testCanDelete() |
|
150 | + { |
|
151 | + $object = $this->objFromFixture(Location::class, 'dynamic'); |
|
152 | + $object->write(); |
|
153 | + |
|
154 | + //test permissions per permission setting |
|
155 | + $create = $this->objFromFixture(Member::class, 'locationcreate'); |
|
156 | + $edit = $this->objFromFixture(Member::class, 'locationedit'); |
|
157 | + $delete = $this->objFromFixture(Member::class, 'locationdelete'); |
|
158 | + |
|
159 | + $this->assertTrue($object->canDelete($delete)); |
|
160 | + $this->assertFalse($object->canDelete($create)); |
|
161 | + $this->assertFalse($object->canDelete($edit)); |
|
162 | + |
|
163 | + $checkObject = $object; |
|
164 | + $object->delete(); |
|
165 | + |
|
166 | + $this->assertEquals($checkObject->ID, 0); |
|
167 | + } |
|
168 | + |
|
169 | + /** |
|
170 | + * |
|
171 | + */ |
|
172 | + public function testCanCreate() |
|
173 | + { |
|
174 | + $object = singleton(Location::class); |
|
175 | + |
|
176 | + //test permissions per permission setting |
|
177 | + $create = $this->objFromFixture(Member::class, 'locationcreate'); |
|
178 | + $edit = $this->objFromFixture(Member::class, 'locationedit'); |
|
179 | + $delete = $this->objFromFixture(Member::class, 'locationdelete'); |
|
180 | + |
|
181 | + $this->assertTrue($object->canCreate($create)); |
|
182 | + $this->assertFalse($object->canCreate($edit)); |
|
183 | + $this->assertFalse($object->canCreate($delete)); |
|
184 | + |
|
185 | + $nullMember = Member::create(); |
|
186 | + $nullMember->write(); |
|
187 | + $this->assertFalse($object->canCreate($nullMember)); |
|
188 | + |
|
189 | + $nullMember->delete(); |
|
190 | + } |
|
191 | + |
|
192 | + /** |
|
193 | + * |
|
194 | + */ |
|
195 | + public function testProvidePermissions() |
|
196 | + { |
|
197 | + $object = Location::create(); |
|
198 | + $expected = [ |
|
199 | + 'Location_EDIT' => 'Edit a Location', |
|
200 | + 'Location_DELETE' => 'Delete a Location', |
|
201 | + 'Location_CREATE' => 'Create a Location', |
|
202 | + ]; |
|
203 | + $this->assertEquals($expected, $object->providePermissions()); |
|
204 | + } |
|
205 | + |
|
206 | + /** |
|
207 | + * |
|
208 | + */ |
|
209 | + public function testUpdateWebsiteURL() |
|
210 | + { |
|
211 | + $location = $this->objFromFixture(Location::class, 'dynamic'); |
|
212 | + |
|
213 | + // Create unsaved raw duplicate |
|
214 | + $map = $location->toMap(); |
|
215 | + unset($map['Created']); |
|
216 | + /** @var static $clone */ |
|
217 | + $clone = Injector::inst()->create(ExtendedLocation::class, $map); |
|
218 | + $clone->ID = 0; |
|
219 | + |
|
220 | + $this->assertEquals('http://www.dynamicagency.com', $location->getWebsiteURL()); |
|
221 | + $this->assertEquals('foo', $clone->getWebsiteURL()); |
|
222 | + } |
|
223 | 223 | } |
@@ -14,69 +14,69 @@ |
||
14 | 14 | */ |
15 | 15 | class LocationCategoryTest extends SapphireTest |
16 | 16 | { |
17 | - /** |
|
18 | - * @var string |
|
19 | - */ |
|
20 | - protected static $fixture_file = '../fixtures.yml'; |
|
17 | + /** |
|
18 | + * @var string |
|
19 | + */ |
|
20 | + protected static $fixture_file = '../fixtures.yml'; |
|
21 | 21 | |
22 | - /** |
|
23 | - * |
|
24 | - */ |
|
25 | - public function testGetCMSFields() |
|
26 | - { |
|
27 | - $object = $this->objFromFixture(LocationCategory::class, 'service'); |
|
28 | - $fieldset = $object->getCMSFields(); |
|
29 | - $this->assertInstanceOf(FieldList::class, $fieldset); |
|
30 | - } |
|
22 | + /** |
|
23 | + * |
|
24 | + */ |
|
25 | + public function testGetCMSFields() |
|
26 | + { |
|
27 | + $object = $this->objFromFixture(LocationCategory::class, 'service'); |
|
28 | + $fieldset = $object->getCMSFields(); |
|
29 | + $this->assertInstanceOf(FieldList::class, $fieldset); |
|
30 | + } |
|
31 | 31 | |
32 | - /** |
|
33 | - * |
|
34 | - */ |
|
35 | - public function testCanView() |
|
36 | - { |
|
37 | - $object = $this->objFromFixture(LocationCategory::class, 'service'); |
|
38 | - $this->assertTrue($object->canView()); |
|
39 | - } |
|
32 | + /** |
|
33 | + * |
|
34 | + */ |
|
35 | + public function testCanView() |
|
36 | + { |
|
37 | + $object = $this->objFromFixture(LocationCategory::class, 'service'); |
|
38 | + $this->assertTrue($object->canView()); |
|
39 | + } |
|
40 | 40 | |
41 | - /** |
|
42 | - * |
|
43 | - */ |
|
44 | - public function testCanEdit() |
|
45 | - { |
|
46 | - $object = $this->objFromFixture(LocationCategory::class, 'service'); |
|
41 | + /** |
|
42 | + * |
|
43 | + */ |
|
44 | + public function testCanEdit() |
|
45 | + { |
|
46 | + $object = $this->objFromFixture(LocationCategory::class, 'service'); |
|
47 | 47 | |
48 | - $admin = $this->objFromFixture(Member::class, 'locationedit'); |
|
49 | - $this->assertTrue($object->canEdit($admin)); |
|
48 | + $admin = $this->objFromFixture(Member::class, 'locationedit'); |
|
49 | + $this->assertTrue($object->canEdit($admin)); |
|
50 | 50 | |
51 | - $member = $this->objFromFixture(Member::class, 'default'); |
|
52 | - $this->assertFalse($object->canEdit($member)); |
|
53 | - } |
|
51 | + $member = $this->objFromFixture(Member::class, 'default'); |
|
52 | + $this->assertFalse($object->canEdit($member)); |
|
53 | + } |
|
54 | 54 | |
55 | - /** |
|
56 | - * |
|
57 | - */ |
|
58 | - public function testCanDelete() |
|
59 | - { |
|
60 | - $object = $this->objFromFixture(LocationCategory::class, 'service'); |
|
55 | + /** |
|
56 | + * |
|
57 | + */ |
|
58 | + public function testCanDelete() |
|
59 | + { |
|
60 | + $object = $this->objFromFixture(LocationCategory::class, 'service'); |
|
61 | 61 | |
62 | - $admin = $this->objFromFixture(Member::class, 'locationdelete'); |
|
63 | - $this->assertTrue($object->canDelete($admin)); |
|
62 | + $admin = $this->objFromFixture(Member::class, 'locationdelete'); |
|
63 | + $this->assertTrue($object->canDelete($admin)); |
|
64 | 64 | |
65 | - $member = $this->objFromFixture(Member::class, 'default'); |
|
66 | - $this->assertFalse($object->canDelete($member)); |
|
67 | - } |
|
65 | + $member = $this->objFromFixture(Member::class, 'default'); |
|
66 | + $this->assertFalse($object->canDelete($member)); |
|
67 | + } |
|
68 | 68 | |
69 | - /** |
|
70 | - * |
|
71 | - */ |
|
72 | - public function testCanCreate() |
|
73 | - { |
|
74 | - $object = $this->objFromFixture(LocationCategory::class, 'service'); |
|
69 | + /** |
|
70 | + * |
|
71 | + */ |
|
72 | + public function testCanCreate() |
|
73 | + { |
|
74 | + $object = $this->objFromFixture(LocationCategory::class, 'service'); |
|
75 | 75 | |
76 | - $admin = $this->objFromFixture(Member::class, 'locationcreate'); |
|
77 | - $this->assertTrue($object->canCreate($admin)); |
|
76 | + $admin = $this->objFromFixture(Member::class, 'locationcreate'); |
|
77 | + $this->assertTrue($object->canCreate($admin)); |
|
78 | 78 | |
79 | - $member = $this->objFromFixture(Member::class, 'default'); |
|
80 | - $this->assertFalse($object->canCreate($member)); |
|
81 | - } |
|
79 | + $member = $this->objFromFixture(Member::class, 'default'); |
|
80 | + $this->assertFalse($object->canCreate($member)); |
|
81 | + } |
|
82 | 82 | } |
@@ -59,7 +59,7 @@ |
||
59 | 59 | */ |
60 | 60 | public function getCMSFields() |
61 | 61 | { |
62 | - $this->beforeUpdateCMSFields(function ($fields) { |
|
62 | + $this->beforeUpdateCMSFields(function($fields) { |
|
63 | 63 | $fields->removeByName([ |
64 | 64 | 'Locations', |
65 | 65 | 'LocationSet', |
@@ -20,125 +20,125 @@ |
||
20 | 20 | */ |
21 | 21 | class LocationCategory extends DataObject |
22 | 22 | { |
23 | - /** |
|
24 | - * @var string |
|
25 | - */ |
|
26 | - private static $singular_name = 'Category'; |
|
27 | - |
|
28 | - /** |
|
29 | - * @var string |
|
30 | - */ |
|
31 | - private static $plural_name = 'Categories'; |
|
32 | - |
|
33 | - /** |
|
34 | - * @var array |
|
35 | - */ |
|
36 | - private static $db = array( |
|
37 | - 'Name' => 'Varchar(100)', |
|
38 | - ); |
|
39 | - |
|
40 | - /** |
|
41 | - * @var array |
|
42 | - */ |
|
43 | - private static $belongs_many_many = array( |
|
44 | - 'Locators' => Locator::class, |
|
45 | - 'LocationSet' => Location::class, |
|
46 | - ); |
|
47 | - |
|
48 | - /** |
|
49 | - * @var string |
|
50 | - */ |
|
51 | - private static $table_name = 'LocationCategory'; |
|
52 | - |
|
53 | - /** |
|
54 | - * @var string |
|
55 | - */ |
|
56 | - private static $default_sort = 'Name'; |
|
57 | - |
|
58 | - /** |
|
59 | - * @return \SilverStripe\Forms\FieldList |
|
60 | - */ |
|
61 | - public function getCMSFields() |
|
62 | - { |
|
63 | - $this->beforeUpdateCMSFields(function ($fields) { |
|
64 | - $fields->removeByName([ |
|
65 | - 'Locations', |
|
66 | - 'LocationSet', |
|
67 | - 'Locators', |
|
68 | - 'LinkTracking', |
|
69 | - 'FileTracking', |
|
70 | - ]); |
|
71 | - |
|
72 | - if ($this->ID) { |
|
73 | - // Locations |
|
74 | - $config = GridFieldConfig_RelationEditor::create(); |
|
75 | - $config->removeComponentsByType([ |
|
76 | - GridFieldAddExistingAutocompleter::class, |
|
77 | - GridFieldAddNewButton::class |
|
78 | - ]) |
|
79 | - ->addComponents([ |
|
80 | - new GridFieldAddExistingSearchButton(), |
|
81 | - ]); |
|
82 | - $locations = $this->Locations(); |
|
83 | - $locationField = GridField::create('Locations', 'Locations', $locations, $config); |
|
84 | - |
|
85 | - $fields->addFieldsToTab('Root.Main', array( |
|
86 | - $locationField, |
|
87 | - )); |
|
88 | - } |
|
89 | - }); |
|
90 | - |
|
91 | - $fields = parent::getCMSFields(); |
|
92 | - |
|
93 | - return $fields; |
|
94 | - } |
|
95 | - |
|
96 | - /** |
|
97 | - * For backwards compatability |
|
98 | - * @return Locations|ManyManyList |
|
99 | - */ |
|
100 | - public function Locations() |
|
101 | - { |
|
102 | - return $this->LocationSet(); |
|
103 | - } |
|
104 | - |
|
105 | - /** |
|
106 | - * @param null $member |
|
107 | - * @param array $context |
|
108 | - * @return bool |
|
109 | - */ |
|
110 | - public function canView($member = null, $context = []) |
|
111 | - { |
|
112 | - return true; |
|
113 | - } |
|
114 | - |
|
115 | - /** |
|
116 | - * @param null $member |
|
117 | - * @param array $context |
|
118 | - * @return bool|int |
|
119 | - */ |
|
120 | - public function canEdit($member = null, $context = []) |
|
121 | - { |
|
122 | - return Permission::check('Location_EDIT', 'any', $member); |
|
123 | - } |
|
124 | - |
|
125 | - /** |
|
126 | - * @param null $member |
|
127 | - * @param array $context |
|
128 | - * @return bool|int |
|
129 | - */ |
|
130 | - public function canDelete($member = null, $context = []) |
|
131 | - { |
|
132 | - return Permission::check('Location_DELETE', 'any', $member); |
|
133 | - } |
|
134 | - |
|
135 | - /** |
|
136 | - * @param null $member |
|
137 | - * @param array $context |
|
138 | - * @return bool|int |
|
139 | - */ |
|
140 | - public function canCreate($member = null, $context = []) |
|
141 | - { |
|
142 | - return Permission::check('Location_CREATE', 'any', $member); |
|
143 | - } |
|
23 | + /** |
|
24 | + * @var string |
|
25 | + */ |
|
26 | + private static $singular_name = 'Category'; |
|
27 | + |
|
28 | + /** |
|
29 | + * @var string |
|
30 | + */ |
|
31 | + private static $plural_name = 'Categories'; |
|
32 | + |
|
33 | + /** |
|
34 | + * @var array |
|
35 | + */ |
|
36 | + private static $db = array( |
|
37 | + 'Name' => 'Varchar(100)', |
|
38 | + ); |
|
39 | + |
|
40 | + /** |
|
41 | + * @var array |
|
42 | + */ |
|
43 | + private static $belongs_many_many = array( |
|
44 | + 'Locators' => Locator::class, |
|
45 | + 'LocationSet' => Location::class, |
|
46 | + ); |
|
47 | + |
|
48 | + /** |
|
49 | + * @var string |
|
50 | + */ |
|
51 | + private static $table_name = 'LocationCategory'; |
|
52 | + |
|
53 | + /** |
|
54 | + * @var string |
|
55 | + */ |
|
56 | + private static $default_sort = 'Name'; |
|
57 | + |
|
58 | + /** |
|
59 | + * @return \SilverStripe\Forms\FieldList |
|
60 | + */ |
|
61 | + public function getCMSFields() |
|
62 | + { |
|
63 | + $this->beforeUpdateCMSFields(function ($fields) { |
|
64 | + $fields->removeByName([ |
|
65 | + 'Locations', |
|
66 | + 'LocationSet', |
|
67 | + 'Locators', |
|
68 | + 'LinkTracking', |
|
69 | + 'FileTracking', |
|
70 | + ]); |
|
71 | + |
|
72 | + if ($this->ID) { |
|
73 | + // Locations |
|
74 | + $config = GridFieldConfig_RelationEditor::create(); |
|
75 | + $config->removeComponentsByType([ |
|
76 | + GridFieldAddExistingAutocompleter::class, |
|
77 | + GridFieldAddNewButton::class |
|
78 | + ]) |
|
79 | + ->addComponents([ |
|
80 | + new GridFieldAddExistingSearchButton(), |
|
81 | + ]); |
|
82 | + $locations = $this->Locations(); |
|
83 | + $locationField = GridField::create('Locations', 'Locations', $locations, $config); |
|
84 | + |
|
85 | + $fields->addFieldsToTab('Root.Main', array( |
|
86 | + $locationField, |
|
87 | + )); |
|
88 | + } |
|
89 | + }); |
|
90 | + |
|
91 | + $fields = parent::getCMSFields(); |
|
92 | + |
|
93 | + return $fields; |
|
94 | + } |
|
95 | + |
|
96 | + /** |
|
97 | + * For backwards compatability |
|
98 | + * @return Locations|ManyManyList |
|
99 | + */ |
|
100 | + public function Locations() |
|
101 | + { |
|
102 | + return $this->LocationSet(); |
|
103 | + } |
|
104 | + |
|
105 | + /** |
|
106 | + * @param null $member |
|
107 | + * @param array $context |
|
108 | + * @return bool |
|
109 | + */ |
|
110 | + public function canView($member = null, $context = []) |
|
111 | + { |
|
112 | + return true; |
|
113 | + } |
|
114 | + |
|
115 | + /** |
|
116 | + * @param null $member |
|
117 | + * @param array $context |
|
118 | + * @return bool|int |
|
119 | + */ |
|
120 | + public function canEdit($member = null, $context = []) |
|
121 | + { |
|
122 | + return Permission::check('Location_EDIT', 'any', $member); |
|
123 | + } |
|
124 | + |
|
125 | + /** |
|
126 | + * @param null $member |
|
127 | + * @param array $context |
|
128 | + * @return bool|int |
|
129 | + */ |
|
130 | + public function canDelete($member = null, $context = []) |
|
131 | + { |
|
132 | + return Permission::check('Location_DELETE', 'any', $member); |
|
133 | + } |
|
134 | + |
|
135 | + /** |
|
136 | + * @param null $member |
|
137 | + * @param array $context |
|
138 | + * @return bool|int |
|
139 | + */ |
|
140 | + public function canCreate($member = null, $context = []) |
|
141 | + { |
|
142 | + return Permission::check('Location_CREATE', 'any', $member); |
|
143 | + } |
|
144 | 144 | } |
@@ -70,7 +70,7 @@ |
||
70 | 70 | */ |
71 | 71 | public function getCMSFields() |
72 | 72 | { |
73 | - $this->beforeUpdateCMSFields(function ($fields) { |
|
73 | + $this->beforeUpdateCMSFields(function($fields) { |
|
74 | 74 | // Settings |
75 | 75 | $fields->addFieldsToTab('Root.Settings', array( |
76 | 76 | HeaderField::create('DisplayOptions', 'Display Options', 3), |
@@ -26,246 +26,246 @@ |
||
26 | 26 | */ |
27 | 27 | class Locator extends \Page |
28 | 28 | { |
29 | - /** |
|
30 | - * @var string |
|
31 | - */ |
|
32 | - private static $singular_name = 'Locator'; |
|
33 | - |
|
34 | - /** |
|
35 | - * @var string |
|
36 | - */ |
|
37 | - private static $plural_name = 'Locators'; |
|
38 | - |
|
39 | - /** |
|
40 | - * @var string |
|
41 | - */ |
|
42 | - private static $description = 'Display locations on a map'; |
|
43 | - |
|
44 | - /** |
|
45 | - * @var array |
|
46 | - */ |
|
47 | - private static $db = array( |
|
48 | - 'Unit' => 'Enum("m,km","m")', |
|
49 | - ); |
|
50 | - |
|
51 | - /** |
|
52 | - * @var array |
|
53 | - */ |
|
54 | - private static $many_many = array( |
|
55 | - 'Categories' => LocationCategory::class, |
|
56 | - ); |
|
57 | - |
|
58 | - /** |
|
59 | - * @var string |
|
60 | - */ |
|
61 | - private static $table_name = 'Locator'; |
|
62 | - |
|
63 | - /** |
|
64 | - * @var string |
|
65 | - */ |
|
66 | - private static $location_class = Location::class; |
|
67 | - |
|
68 | - /** |
|
69 | - * @return FieldList |
|
70 | - */ |
|
71 | - public function getCMSFields() |
|
72 | - { |
|
73 | - $this->beforeUpdateCMSFields(function ($fields) { |
|
74 | - // Settings |
|
75 | - $fields->addFieldsToTab('Root.Settings', array( |
|
76 | - HeaderField::create('DisplayOptions', 'Display Options', 3), |
|
77 | - OptionsetField::create('Unit', 'Unit of measure', array('m' => 'Miles', 'km' => 'Kilometers')), |
|
78 | - )); |
|
79 | - |
|
80 | - // Filter categories |
|
81 | - $config = GridFieldConfig_RelationEditor::create(); |
|
82 | - $config->removeComponentsByType(GridFieldAddExistingAutocompleter::class); |
|
83 | - $config->addComponent(new GridFieldAddExistingSearchButton()); |
|
84 | - $categories = $this->Categories(); |
|
85 | - $categoriesField = GridField::create('Categories', 'Categories', $categories, $config) |
|
86 | - ->setDescription('only show locations from the selected category'); |
|
87 | - |
|
88 | - // Filter |
|
89 | - $fields->addFieldsToTab('Root.Filter', array( |
|
90 | - HeaderField::create('CategoryOptionsHeader', 'Location Filtering', 3), |
|
91 | - $categoriesField, |
|
92 | - )); |
|
93 | - }); |
|
94 | - |
|
95 | - return parent::getCMSFields(); |
|
96 | - } |
|
97 | - |
|
98 | - /** |
|
99 | - * @param array $filter |
|
100 | - * @param array $filterAny |
|
101 | - * @param array $exclude |
|
102 | - * @param null|callable $callback |
|
103 | - * |
|
104 | - * @return DataList|ArrayList |
|
105 | - */ |
|
106 | - public static function get_locations( |
|
107 | - $filter = [], |
|
108 | - $filterAny = [], |
|
109 | - $exclude = [], |
|
110 | - $callback = null |
|
111 | - ) { |
|
112 | - $locationClass = Config::inst()->get(static::class, 'location_class'); |
|
113 | - $locations = $locationClass::get()->filter($filter)->exclude($exclude); |
|
114 | - |
|
115 | - if (!empty($filterAny)) { |
|
116 | - $locations = $locations->filterAny($filterAny); |
|
117 | - } |
|
118 | - if (!empty($exclude)) { |
|
119 | - $locations = $locations->exclude($exclude); |
|
120 | - } |
|
121 | - |
|
122 | - if ($callback !== null && is_callable($callback)) { |
|
123 | - $locations->filterByCallback($callback); |
|
124 | - } |
|
125 | - |
|
126 | - return $locations; |
|
127 | - } |
|
128 | - |
|
129 | - /** |
|
130 | - * @return DataList |
|
131 | - */ |
|
132 | - public static function get_all_categories() |
|
133 | - { |
|
134 | - return LocationCategory::get(); |
|
135 | - } |
|
136 | - |
|
137 | - /** |
|
138 | - * @return bool |
|
139 | - */ |
|
140 | - public function getPageCategories() |
|
141 | - { |
|
142 | - return self::locator_categories_by_locator($this->ID); |
|
143 | - } |
|
144 | - |
|
145 | - /** |
|
146 | - * @param int $id |
|
147 | - * |
|
148 | - * @return bool| |
|
149 | - */ |
|
150 | - public static function locator_categories_by_locator($id = 0) |
|
151 | - { |
|
152 | - if ($id == 0) { |
|
153 | - return false; |
|
154 | - } |
|
155 | - |
|
156 | - return static::get()->byID($id)->getUsedCategories(); |
|
157 | - } |
|
158 | - |
|
159 | - /** |
|
160 | - * Gets the list of radii |
|
161 | - * |
|
162 | - * @return ArrayList |
|
163 | - */ |
|
164 | - public function getRadii() |
|
165 | - { |
|
166 | - $radii = [ |
|
167 | - '0' => '25', |
|
168 | - '1' => '50', |
|
169 | - '2' => '75', |
|
170 | - '3' => '100', |
|
171 | - ]; |
|
172 | - $config_radii = $this->config()->get('radii'); |
|
173 | - if ($config_radii) { |
|
174 | - $radii = $config_radii; |
|
175 | - } |
|
176 | - |
|
177 | - return $radii; |
|
178 | - } |
|
179 | - |
|
180 | - public function getRadiiArrayList() |
|
181 | - { |
|
182 | - $list = []; |
|
183 | - |
|
184 | - foreach ($this->getRadii() as $radius) { |
|
185 | - $list[] = new ArrayData(array( |
|
186 | - 'Radius' => $radius, |
|
187 | - )); |
|
188 | - } |
|
189 | - |
|
190 | - return new ArrayList($list); |
|
191 | - } |
|
192 | - |
|
193 | - /** |
|
194 | - * Gets the limit of locations |
|
195 | - * @return mixed |
|
196 | - */ |
|
197 | - public function getLimit() |
|
198 | - { |
|
199 | - return $this->config()->get('limit'); |
|
200 | - } |
|
201 | - |
|
202 | - /** |
|
203 | - * Gets if the radius drop down should be shown |
|
204 | - * @return mixed |
|
205 | - */ |
|
206 | - public function getShowRadius() |
|
207 | - { |
|
208 | - return $this->config()->get('show_radius'); |
|
209 | - } |
|
210 | - |
|
211 | - /** |
|
212 | - * @return mixed |
|
213 | - */ |
|
214 | - public function getUsedCategories() |
|
215 | - { |
|
216 | - return $this->Categories()->filter([ |
|
217 | - 'LocationSet.ID:GreaterThan' => 0, |
|
218 | - ]); |
|
219 | - } |
|
220 | - |
|
221 | - /** |
|
222 | - * Gets the path of the info window template |
|
223 | - * |
|
224 | - * @return string |
|
225 | - */ |
|
226 | - public function getInfoWindowTemplate() |
|
227 | - { |
|
228 | - return ModuleResourceLoader::singleton()->resolveURL( |
|
229 | - Config::inst()->get( |
|
230 | - static::class, |
|
231 | - 'infoWindowTemplate' |
|
232 | - ) |
|
233 | - ); |
|
234 | - } |
|
235 | - |
|
236 | - /** |
|
237 | - * Gets the path of the list template |
|
238 | - * |
|
239 | - * @return string |
|
240 | - */ |
|
241 | - public function getListTemplate() |
|
242 | - { |
|
243 | - return ModuleResourceLoader::singleton()->resolveURL( |
|
244 | - Config::inst()->get( |
|
245 | - static::class, |
|
246 | - 'listTemplate' |
|
247 | - ) |
|
248 | - ); |
|
249 | - } |
|
250 | - |
|
251 | - /** |
|
252 | - * @return null|string |
|
253 | - */ |
|
254 | - public function getMapStyle() |
|
255 | - { |
|
256 | - return AddressDataExtension::getMapStyleJSON(); |
|
257 | - } |
|
258 | - |
|
259 | - public function getMapStyleJSONPath() |
|
260 | - { |
|
261 | - return AddressDataExtension::getMapStyleJSONPath(); |
|
262 | - } |
|
263 | - |
|
264 | - /** |
|
265 | - * @return null|string |
|
266 | - */ |
|
267 | - public function getMarkerIcon() |
|
268 | - { |
|
269 | - return AddressDataExtension::getIconImage(); |
|
270 | - } |
|
29 | + /** |
|
30 | + * @var string |
|
31 | + */ |
|
32 | + private static $singular_name = 'Locator'; |
|
33 | + |
|
34 | + /** |
|
35 | + * @var string |
|
36 | + */ |
|
37 | + private static $plural_name = 'Locators'; |
|
38 | + |
|
39 | + /** |
|
40 | + * @var string |
|
41 | + */ |
|
42 | + private static $description = 'Display locations on a map'; |
|
43 | + |
|
44 | + /** |
|
45 | + * @var array |
|
46 | + */ |
|
47 | + private static $db = array( |
|
48 | + 'Unit' => 'Enum("m,km","m")', |
|
49 | + ); |
|
50 | + |
|
51 | + /** |
|
52 | + * @var array |
|
53 | + */ |
|
54 | + private static $many_many = array( |
|
55 | + 'Categories' => LocationCategory::class, |
|
56 | + ); |
|
57 | + |
|
58 | + /** |
|
59 | + * @var string |
|
60 | + */ |
|
61 | + private static $table_name = 'Locator'; |
|
62 | + |
|
63 | + /** |
|
64 | + * @var string |
|
65 | + */ |
|
66 | + private static $location_class = Location::class; |
|
67 | + |
|
68 | + /** |
|
69 | + * @return FieldList |
|
70 | + */ |
|
71 | + public function getCMSFields() |
|
72 | + { |
|
73 | + $this->beforeUpdateCMSFields(function ($fields) { |
|
74 | + // Settings |
|
75 | + $fields->addFieldsToTab('Root.Settings', array( |
|
76 | + HeaderField::create('DisplayOptions', 'Display Options', 3), |
|
77 | + OptionsetField::create('Unit', 'Unit of measure', array('m' => 'Miles', 'km' => 'Kilometers')), |
|
78 | + )); |
|
79 | + |
|
80 | + // Filter categories |
|
81 | + $config = GridFieldConfig_RelationEditor::create(); |
|
82 | + $config->removeComponentsByType(GridFieldAddExistingAutocompleter::class); |
|
83 | + $config->addComponent(new GridFieldAddExistingSearchButton()); |
|
84 | + $categories = $this->Categories(); |
|
85 | + $categoriesField = GridField::create('Categories', 'Categories', $categories, $config) |
|
86 | + ->setDescription('only show locations from the selected category'); |
|
87 | + |
|
88 | + // Filter |
|
89 | + $fields->addFieldsToTab('Root.Filter', array( |
|
90 | + HeaderField::create('CategoryOptionsHeader', 'Location Filtering', 3), |
|
91 | + $categoriesField, |
|
92 | + )); |
|
93 | + }); |
|
94 | + |
|
95 | + return parent::getCMSFields(); |
|
96 | + } |
|
97 | + |
|
98 | + /** |
|
99 | + * @param array $filter |
|
100 | + * @param array $filterAny |
|
101 | + * @param array $exclude |
|
102 | + * @param null|callable $callback |
|
103 | + * |
|
104 | + * @return DataList|ArrayList |
|
105 | + */ |
|
106 | + public static function get_locations( |
|
107 | + $filter = [], |
|
108 | + $filterAny = [], |
|
109 | + $exclude = [], |
|
110 | + $callback = null |
|
111 | + ) { |
|
112 | + $locationClass = Config::inst()->get(static::class, 'location_class'); |
|
113 | + $locations = $locationClass::get()->filter($filter)->exclude($exclude); |
|
114 | + |
|
115 | + if (!empty($filterAny)) { |
|
116 | + $locations = $locations->filterAny($filterAny); |
|
117 | + } |
|
118 | + if (!empty($exclude)) { |
|
119 | + $locations = $locations->exclude($exclude); |
|
120 | + } |
|
121 | + |
|
122 | + if ($callback !== null && is_callable($callback)) { |
|
123 | + $locations->filterByCallback($callback); |
|
124 | + } |
|
125 | + |
|
126 | + return $locations; |
|
127 | + } |
|
128 | + |
|
129 | + /** |
|
130 | + * @return DataList |
|
131 | + */ |
|
132 | + public static function get_all_categories() |
|
133 | + { |
|
134 | + return LocationCategory::get(); |
|
135 | + } |
|
136 | + |
|
137 | + /** |
|
138 | + * @return bool |
|
139 | + */ |
|
140 | + public function getPageCategories() |
|
141 | + { |
|
142 | + return self::locator_categories_by_locator($this->ID); |
|
143 | + } |
|
144 | + |
|
145 | + /** |
|
146 | + * @param int $id |
|
147 | + * |
|
148 | + * @return bool| |
|
149 | + */ |
|
150 | + public static function locator_categories_by_locator($id = 0) |
|
151 | + { |
|
152 | + if ($id == 0) { |
|
153 | + return false; |
|
154 | + } |
|
155 | + |
|
156 | + return static::get()->byID($id)->getUsedCategories(); |
|
157 | + } |
|
158 | + |
|
159 | + /** |
|
160 | + * Gets the list of radii |
|
161 | + * |
|
162 | + * @return ArrayList |
|
163 | + */ |
|
164 | + public function getRadii() |
|
165 | + { |
|
166 | + $radii = [ |
|
167 | + '0' => '25', |
|
168 | + '1' => '50', |
|
169 | + '2' => '75', |
|
170 | + '3' => '100', |
|
171 | + ]; |
|
172 | + $config_radii = $this->config()->get('radii'); |
|
173 | + if ($config_radii) { |
|
174 | + $radii = $config_radii; |
|
175 | + } |
|
176 | + |
|
177 | + return $radii; |
|
178 | + } |
|
179 | + |
|
180 | + public function getRadiiArrayList() |
|
181 | + { |
|
182 | + $list = []; |
|
183 | + |
|
184 | + foreach ($this->getRadii() as $radius) { |
|
185 | + $list[] = new ArrayData(array( |
|
186 | + 'Radius' => $radius, |
|
187 | + )); |
|
188 | + } |
|
189 | + |
|
190 | + return new ArrayList($list); |
|
191 | + } |
|
192 | + |
|
193 | + /** |
|
194 | + * Gets the limit of locations |
|
195 | + * @return mixed |
|
196 | + */ |
|
197 | + public function getLimit() |
|
198 | + { |
|
199 | + return $this->config()->get('limit'); |
|
200 | + } |
|
201 | + |
|
202 | + /** |
|
203 | + * Gets if the radius drop down should be shown |
|
204 | + * @return mixed |
|
205 | + */ |
|
206 | + public function getShowRadius() |
|
207 | + { |
|
208 | + return $this->config()->get('show_radius'); |
|
209 | + } |
|
210 | + |
|
211 | + /** |
|
212 | + * @return mixed |
|
213 | + */ |
|
214 | + public function getUsedCategories() |
|
215 | + { |
|
216 | + return $this->Categories()->filter([ |
|
217 | + 'LocationSet.ID:GreaterThan' => 0, |
|
218 | + ]); |
|
219 | + } |
|
220 | + |
|
221 | + /** |
|
222 | + * Gets the path of the info window template |
|
223 | + * |
|
224 | + * @return string |
|
225 | + */ |
|
226 | + public function getInfoWindowTemplate() |
|
227 | + { |
|
228 | + return ModuleResourceLoader::singleton()->resolveURL( |
|
229 | + Config::inst()->get( |
|
230 | + static::class, |
|
231 | + 'infoWindowTemplate' |
|
232 | + ) |
|
233 | + ); |
|
234 | + } |
|
235 | + |
|
236 | + /** |
|
237 | + * Gets the path of the list template |
|
238 | + * |
|
239 | + * @return string |
|
240 | + */ |
|
241 | + public function getListTemplate() |
|
242 | + { |
|
243 | + return ModuleResourceLoader::singleton()->resolveURL( |
|
244 | + Config::inst()->get( |
|
245 | + static::class, |
|
246 | + 'listTemplate' |
|
247 | + ) |
|
248 | + ); |
|
249 | + } |
|
250 | + |
|
251 | + /** |
|
252 | + * @return null|string |
|
253 | + */ |
|
254 | + public function getMapStyle() |
|
255 | + { |
|
256 | + return AddressDataExtension::getMapStyleJSON(); |
|
257 | + } |
|
258 | + |
|
259 | + public function getMapStyleJSONPath() |
|
260 | + { |
|
261 | + return AddressDataExtension::getMapStyleJSONPath(); |
|
262 | + } |
|
263 | + |
|
264 | + /** |
|
265 | + * @return null|string |
|
266 | + */ |
|
267 | + public function getMarkerIcon() |
|
268 | + { |
|
269 | + return AddressDataExtension::getIconImage(); |
|
270 | + } |
|
271 | 271 | } |
@@ -21,158 +21,158 @@ |
||
21 | 21 | */ |
22 | 22 | class LocatorTest extends FunctionalTest |
23 | 23 | { |
24 | - /** |
|
25 | - * @var string |
|
26 | - */ |
|
27 | - protected static $fixture_file = '../fixtures.yml'; |
|
28 | - |
|
29 | - /** |
|
30 | - * |
|
31 | - */ |
|
32 | - public function testGetCMSFields() |
|
33 | - { |
|
34 | - /** @var Locator $locator */ |
|
35 | - $locator = Injector::inst()->create(Locator::class); |
|
36 | - $this->assertInstanceOf(FieldList::class, $locator->getCMSFields()); |
|
37 | - } |
|
38 | - |
|
39 | - /** |
|
40 | - * |
|
41 | - */ |
|
42 | - public function testLocations() |
|
43 | - { |
|
44 | - $filter = Config::inst()->get(LocatorController::class, 'base_filter'); |
|
45 | - $filterAny = Config::inst()->get(LocatorController::class, 'base_filter_any'); |
|
46 | - $exclude = Config::inst()->get(LocatorController::class, 'base_exclude'); |
|
47 | - $locations = Locator::get_locations($filter, $filterAny, $exclude); |
|
48 | - $locations2 = Location::get()->filter($filter)->filterAny($filterAny)->exclude($exclude); |
|
49 | - $this->assertEquals($locations->count(), $locations2->count()); |
|
50 | - } |
|
51 | - |
|
52 | - /** |
|
53 | - * |
|
54 | - */ |
|
55 | - public function testGetAllCategories() |
|
56 | - { |
|
57 | - $this->assertEquals(Locator::get_all_categories()->count(), 4); |
|
58 | - } |
|
59 | - |
|
60 | - /** |
|
61 | - * |
|
62 | - */ |
|
63 | - public function testGetPageCategories() |
|
64 | - { |
|
65 | - $locator = $this->objFromFixture(Locator::class, 'locator1'); |
|
66 | - $this->assertEquals($locator->getPageCategories()->count(), 1); |
|
67 | - } |
|
68 | - |
|
69 | - /** |
|
70 | - * |
|
71 | - */ |
|
72 | - public function testLocator_categories_by_locator() |
|
73 | - { |
|
74 | - $categories = Locator::locator_categories_by_locator(0); |
|
75 | - $this->assertFalse($categories); |
|
76 | - } |
|
77 | - |
|
78 | - /** |
|
79 | - * |
|
80 | - */ |
|
81 | - public function testLocatorCategoriesByLocator() |
|
82 | - { |
|
83 | - |
|
84 | - $locator = $this->objFromFixture(Locator::class, 'locator1'); |
|
85 | - $this->assertEquals(Locator::locator_categories_by_locator($locator->ID)->count(), 1); |
|
86 | - |
|
87 | - $newLocator = Locator::create(); |
|
88 | - $newLocator->Title = 'Locator 2'; |
|
89 | - $newLocator->write(); |
|
90 | - |
|
91 | - $this->assertEquals(Locator::locator_categories_by_locator($newLocator->ID)->count(), 0); |
|
92 | - } |
|
93 | - |
|
94 | - /** |
|
95 | - * |
|
96 | - */ |
|
97 | - public function testGetRadii() |
|
98 | - { |
|
99 | - /** @var Locator $locator */ |
|
100 | - $locator = Injector::inst()->create(Locator::class); |
|
101 | - $radii = [ |
|
102 | - '0' => '5', |
|
103 | - '1' => '10', |
|
104 | - '2' => '15', |
|
105 | - '3' => '100', |
|
106 | - ]; |
|
107 | - Config::modify()->set(Locator::class, 'radii', $radii); |
|
108 | - $this->assertEquals($radii, $locator->getRadii()); |
|
109 | - } |
|
110 | - |
|
111 | - /** |
|
112 | - * |
|
113 | - */ |
|
114 | - public function testGetRadiiArrayList() |
|
115 | - { |
|
116 | - /** @var Locator $locator */ |
|
117 | - $locator = Injector::inst()->create(Locator::class); |
|
118 | - $this->assertInstanceOf(ArrayList::class, $locator->getRadiiArrayList()); |
|
119 | - } |
|
120 | - |
|
121 | - /** |
|
122 | - * |
|
123 | - */ |
|
124 | - public function testGetLimit() |
|
125 | - { |
|
126 | - /** @var Locator $locator */ |
|
127 | - $locator = Injector::inst()->create(Locator::class); |
|
128 | - $this->assertEquals(50, $locator->getLimit()); |
|
129 | - } |
|
130 | - |
|
131 | - /** |
|
132 | - * |
|
133 | - */ |
|
134 | - public function testGetShowRadius() |
|
135 | - { |
|
136 | - /** @var Locator $locator */ |
|
137 | - $locator = Injector::inst()->create(Locator::class); |
|
138 | - $this->assertTrue($locator->getShowRadius()); |
|
139 | - } |
|
140 | - |
|
141 | - /** |
|
142 | - * |
|
143 | - */ |
|
144 | - public function testGetUsedCategories() |
|
145 | - { |
|
146 | - /** @var Locator $locator */ |
|
147 | - $locator = $this->objFromFixture(Locator::class, 'locator1'); |
|
148 | - |
|
149 | - $categories = $locator->getUsedCategories()->toArray(); |
|
150 | - $this->assertEquals(1, count($categories)); |
|
151 | - } |
|
152 | - |
|
153 | - /** |
|
154 | - * |
|
155 | - */ |
|
156 | - public function testGetInfoWindowTemplate() |
|
157 | - { |
|
158 | - /** @var Locator $object */ |
|
159 | - $object = Injector::inst()->create(Locator::class); |
|
160 | - $template = $object->getInfoWindowTemplate(); |
|
161 | - // get rid of cache ending |
|
162 | - $template = preg_replace('/\?.*$/', '', $template); |
|
163 | - $this->assertStringEndsWith('client/infowindow-description.html', $template); |
|
164 | - } |
|
165 | - |
|
166 | - /** |
|
167 | - * |
|
168 | - */ |
|
169 | - public function testGetListTemplate() |
|
170 | - { |
|
171 | - /** @var Locator $object */ |
|
172 | - $object = Injector::inst()->create(Locator::class); |
|
173 | - $template = $object->getListTemplate(); |
|
174 | - // get rid of cache ending |
|
175 | - $template = preg_replace('/\?.*$/', '', $template); |
|
176 | - $this->assertStringEndsWith('client/location-list-description.html', $template); |
|
177 | - } |
|
24 | + /** |
|
25 | + * @var string |
|
26 | + */ |
|
27 | + protected static $fixture_file = '../fixtures.yml'; |
|
28 | + |
|
29 | + /** |
|
30 | + * |
|
31 | + */ |
|
32 | + public function testGetCMSFields() |
|
33 | + { |
|
34 | + /** @var Locator $locator */ |
|
35 | + $locator = Injector::inst()->create(Locator::class); |
|
36 | + $this->assertInstanceOf(FieldList::class, $locator->getCMSFields()); |
|
37 | + } |
|
38 | + |
|
39 | + /** |
|
40 | + * |
|
41 | + */ |
|
42 | + public function testLocations() |
|
43 | + { |
|
44 | + $filter = Config::inst()->get(LocatorController::class, 'base_filter'); |
|
45 | + $filterAny = Config::inst()->get(LocatorController::class, 'base_filter_any'); |
|
46 | + $exclude = Config::inst()->get(LocatorController::class, 'base_exclude'); |
|
47 | + $locations = Locator::get_locations($filter, $filterAny, $exclude); |
|
48 | + $locations2 = Location::get()->filter($filter)->filterAny($filterAny)->exclude($exclude); |
|
49 | + $this->assertEquals($locations->count(), $locations2->count()); |
|
50 | + } |
|
51 | + |
|
52 | + /** |
|
53 | + * |
|
54 | + */ |
|
55 | + public function testGetAllCategories() |
|
56 | + { |
|
57 | + $this->assertEquals(Locator::get_all_categories()->count(), 4); |
|
58 | + } |
|
59 | + |
|
60 | + /** |
|
61 | + * |
|
62 | + */ |
|
63 | + public function testGetPageCategories() |
|
64 | + { |
|
65 | + $locator = $this->objFromFixture(Locator::class, 'locator1'); |
|
66 | + $this->assertEquals($locator->getPageCategories()->count(), 1); |
|
67 | + } |
|
68 | + |
|
69 | + /** |
|
70 | + * |
|
71 | + */ |
|
72 | + public function testLocator_categories_by_locator() |
|
73 | + { |
|
74 | + $categories = Locator::locator_categories_by_locator(0); |
|
75 | + $this->assertFalse($categories); |
|
76 | + } |
|
77 | + |
|
78 | + /** |
|
79 | + * |
|
80 | + */ |
|
81 | + public function testLocatorCategoriesByLocator() |
|
82 | + { |
|
83 | + |
|
84 | + $locator = $this->objFromFixture(Locator::class, 'locator1'); |
|
85 | + $this->assertEquals(Locator::locator_categories_by_locator($locator->ID)->count(), 1); |
|
86 | + |
|
87 | + $newLocator = Locator::create(); |
|
88 | + $newLocator->Title = 'Locator 2'; |
|
89 | + $newLocator->write(); |
|
90 | + |
|
91 | + $this->assertEquals(Locator::locator_categories_by_locator($newLocator->ID)->count(), 0); |
|
92 | + } |
|
93 | + |
|
94 | + /** |
|
95 | + * |
|
96 | + */ |
|
97 | + public function testGetRadii() |
|
98 | + { |
|
99 | + /** @var Locator $locator */ |
|
100 | + $locator = Injector::inst()->create(Locator::class); |
|
101 | + $radii = [ |
|
102 | + '0' => '5', |
|
103 | + '1' => '10', |
|
104 | + '2' => '15', |
|
105 | + '3' => '100', |
|
106 | + ]; |
|
107 | + Config::modify()->set(Locator::class, 'radii', $radii); |
|
108 | + $this->assertEquals($radii, $locator->getRadii()); |
|
109 | + } |
|
110 | + |
|
111 | + /** |
|
112 | + * |
|
113 | + */ |
|
114 | + public function testGetRadiiArrayList() |
|
115 | + { |
|
116 | + /** @var Locator $locator */ |
|
117 | + $locator = Injector::inst()->create(Locator::class); |
|
118 | + $this->assertInstanceOf(ArrayList::class, $locator->getRadiiArrayList()); |
|
119 | + } |
|
120 | + |
|
121 | + /** |
|
122 | + * |
|
123 | + */ |
|
124 | + public function testGetLimit() |
|
125 | + { |
|
126 | + /** @var Locator $locator */ |
|
127 | + $locator = Injector::inst()->create(Locator::class); |
|
128 | + $this->assertEquals(50, $locator->getLimit()); |
|
129 | + } |
|
130 | + |
|
131 | + /** |
|
132 | + * |
|
133 | + */ |
|
134 | + public function testGetShowRadius() |
|
135 | + { |
|
136 | + /** @var Locator $locator */ |
|
137 | + $locator = Injector::inst()->create(Locator::class); |
|
138 | + $this->assertTrue($locator->getShowRadius()); |
|
139 | + } |
|
140 | + |
|
141 | + /** |
|
142 | + * |
|
143 | + */ |
|
144 | + public function testGetUsedCategories() |
|
145 | + { |
|
146 | + /** @var Locator $locator */ |
|
147 | + $locator = $this->objFromFixture(Locator::class, 'locator1'); |
|
148 | + |
|
149 | + $categories = $locator->getUsedCategories()->toArray(); |
|
150 | + $this->assertEquals(1, count($categories)); |
|
151 | + } |
|
152 | + |
|
153 | + /** |
|
154 | + * |
|
155 | + */ |
|
156 | + public function testGetInfoWindowTemplate() |
|
157 | + { |
|
158 | + /** @var Locator $object */ |
|
159 | + $object = Injector::inst()->create(Locator::class); |
|
160 | + $template = $object->getInfoWindowTemplate(); |
|
161 | + // get rid of cache ending |
|
162 | + $template = preg_replace('/\?.*$/', '', $template); |
|
163 | + $this->assertStringEndsWith('client/infowindow-description.html', $template); |
|
164 | + } |
|
165 | + |
|
166 | + /** |
|
167 | + * |
|
168 | + */ |
|
169 | + public function testGetListTemplate() |
|
170 | + { |
|
171 | + /** @var Locator $object */ |
|
172 | + $object = Injector::inst()->create(Locator::class); |
|
173 | + $template = $object->getListTemplate(); |
|
174 | + // get rid of cache ending |
|
175 | + $template = preg_replace('/\?.*$/', '', $template); |
|
176 | + $this->assertStringEndsWith('client/location-list-description.html', $template); |
|
177 | + } |
|
178 | 178 | } |
@@ -19,88 +19,88 @@ |
||
19 | 19 | class LocatorForm extends Form |
20 | 20 | { |
21 | 21 | |
22 | - /** |
|
23 | - * LocatorForm constructor. |
|
24 | - * @param Controller $controller |
|
25 | - * @param string $name |
|
26 | - */ |
|
27 | - public function __construct(Controller $controller, $name) |
|
28 | - { |
|
22 | + /** |
|
23 | + * LocatorForm constructor. |
|
24 | + * @param Controller $controller |
|
25 | + * @param string $name |
|
26 | + */ |
|
27 | + public function __construct(Controller $controller, $name) |
|
28 | + { |
|
29 | 29 | |
30 | - $fields = FieldList::create( |
|
31 | - TextField::create('Address') |
|
32 | - ->setTitle('') |
|
33 | - ->setAttribute('placeholder', 'address or zip code') |
|
34 | - ); |
|
30 | + $fields = FieldList::create( |
|
31 | + TextField::create('Address') |
|
32 | + ->setTitle('') |
|
33 | + ->setAttribute('placeholder', 'address or zip code') |
|
34 | + ); |
|
35 | 35 | |
36 | - $pageCategories = Locator::locator_categories_by_locator($controller->data()->ID); |
|
37 | - if ($pageCategories && $pageCategories->count() > 0) { |
|
38 | - $categories = false; |
|
39 | - } else { |
|
40 | - $categories = Locator::get_all_categories(); |
|
41 | - if ($categories->count() < 1) { |
|
42 | - $categories = false; |
|
43 | - } |
|
44 | - } |
|
36 | + $pageCategories = Locator::locator_categories_by_locator($controller->data()->ID); |
|
37 | + if ($pageCategories && $pageCategories->count() > 0) { |
|
38 | + $categories = false; |
|
39 | + } else { |
|
40 | + $categories = Locator::get_all_categories(); |
|
41 | + if ($categories->count() < 1) { |
|
42 | + $categories = false; |
|
43 | + } |
|
44 | + } |
|
45 | 45 | |
46 | - if ($categories) { |
|
47 | - $categoriesField = DropdownField::create('CategoryID') |
|
48 | - ->setTitle('') |
|
49 | - ->setEmptyString('all categories') |
|
50 | - ->setSource($categories->map()); |
|
51 | - $fields->push($categoriesField); |
|
52 | - } |
|
46 | + if ($categories) { |
|
47 | + $categoriesField = DropdownField::create('CategoryID') |
|
48 | + ->setTitle('') |
|
49 | + ->setEmptyString('all categories') |
|
50 | + ->setSource($categories->map()); |
|
51 | + $fields->push($categoriesField); |
|
52 | + } |
|
53 | 53 | |
54 | - if ($controller->getShowRadius()) { |
|
55 | - $radiusArray = array_values($controller->getRadii()); |
|
56 | - $this->extend('overrideRadiusArray', $radiusArray); |
|
57 | - $fields->push(DropdownField::create('Radius', '', ArrayLib::valuekey($radiusArray)) |
|
58 | - ->setEmptyString('radius')); |
|
59 | - } |
|
54 | + if ($controller->getShowRadius()) { |
|
55 | + $radiusArray = array_values($controller->getRadii()); |
|
56 | + $this->extend('overrideRadiusArray', $radiusArray); |
|
57 | + $fields->push(DropdownField::create('Radius', '', ArrayLib::valuekey($radiusArray)) |
|
58 | + ->setEmptyString('radius')); |
|
59 | + } |
|
60 | 60 | |
61 | - $actions = FieldList::create( |
|
62 | - FormAction::create('doFilterLocations') |
|
63 | - ->setTitle('Search') |
|
64 | - ); |
|
61 | + $actions = FieldList::create( |
|
62 | + FormAction::create('doFilterLocations') |
|
63 | + ->setTitle('Search') |
|
64 | + ); |
|
65 | 65 | |
66 | - $validator = $this->getValidator(); |
|
66 | + $validator = $this->getValidator(); |
|
67 | 67 | |
68 | - parent::__construct($controller, $name, $fields, $actions, $validator); |
|
69 | - } |
|
68 | + parent::__construct($controller, $name, $fields, $actions, $validator); |
|
69 | + } |
|
70 | 70 | |
71 | - /** |
|
72 | - * @return null|RequiredFields|\SilverStripe\Forms\Validator |
|
73 | - */ |
|
74 | - public function getValidator() |
|
75 | - { |
|
76 | - $validator = parent::getValidator(); |
|
77 | - if (empty($validator)) { |
|
78 | - if (!$this->validator instanceof RequiredFields) { |
|
79 | - $this->setValidator(RequiredFields::create('Address')); |
|
80 | - } |
|
81 | - $validator = $this->validator; |
|
82 | - } |
|
83 | - $this->extend('updateRequiredFields', $validator); |
|
84 | - return $validator; |
|
85 | - } |
|
71 | + /** |
|
72 | + * @return null|RequiredFields|\SilverStripe\Forms\Validator |
|
73 | + */ |
|
74 | + public function getValidator() |
|
75 | + { |
|
76 | + $validator = parent::getValidator(); |
|
77 | + if (empty($validator)) { |
|
78 | + if (!$this->validator instanceof RequiredFields) { |
|
79 | + $this->setValidator(RequiredFields::create('Address')); |
|
80 | + } |
|
81 | + $validator = $this->validator; |
|
82 | + } |
|
83 | + $this->extend('updateRequiredFields', $validator); |
|
84 | + return $validator; |
|
85 | + } |
|
86 | 86 | |
87 | - /** |
|
88 | - * @return FieldList |
|
89 | - */ |
|
90 | - public function Fields() |
|
91 | - { |
|
92 | - $fields = parent::Fields(); |
|
93 | - $this->extend('updateLocatorFormFields', $fields); |
|
94 | - return $fields; |
|
95 | - } |
|
87 | + /** |
|
88 | + * @return FieldList |
|
89 | + */ |
|
90 | + public function Fields() |
|
91 | + { |
|
92 | + $fields = parent::Fields(); |
|
93 | + $this->extend('updateLocatorFormFields', $fields); |
|
94 | + return $fields; |
|
95 | + } |
|
96 | 96 | |
97 | - /** |
|
98 | - * @return \SilverStripe\Forms\FieldList |
|
99 | - */ |
|
100 | - public function Actions() |
|
101 | - { |
|
102 | - $actions = parent::Actions(); |
|
103 | - $this->extend('updateLocatorActions', $actions); |
|
104 | - return $actions; |
|
105 | - } |
|
97 | + /** |
|
98 | + * @return \SilverStripe\Forms\FieldList |
|
99 | + */ |
|
100 | + public function Actions() |
|
101 | + { |
|
102 | + $actions = parent::Actions(); |
|
103 | + $this->extend('updateLocatorActions', $actions); |
|
104 | + return $actions; |
|
105 | + } |
|
106 | 106 | } |
@@ -11,47 +11,47 @@ |
||
11 | 11 | |
12 | 12 | class LocatorFormTest extends FunctionalTest |
13 | 13 | { |
14 | - /** |
|
15 | - * @var string |
|
16 | - */ |
|
17 | - protected static $fixture_file = '../fixtures.yml'; |
|
18 | - |
|
19 | - /** |
|
20 | - * |
|
21 | - */ |
|
22 | - public function testLocatorFormBase() |
|
23 | - { |
|
24 | - $form = LocatorForm::create(LocatorController::create(Locator::get()->first()), 'LocatorForm'); |
|
25 | - |
|
26 | - $this->assertInstanceOf(FieldList::class, $form->Fields()); |
|
27 | - $this->assertInstanceOf(RequiredFields::class, $form->getValidator()); |
|
28 | - } |
|
29 | - |
|
30 | - /** |
|
31 | - * |
|
32 | - */ |
|
33 | - public function testUpdateRequiredFields() |
|
34 | - { |
|
35 | - $form = LocatorForm::create(LocatorController::create(Locator::get()->first()), 'LocatorForm'); |
|
36 | - $validator = $form->getValidator(); |
|
37 | - |
|
38 | - $validator->removeRequiredField('Address'); |
|
39 | - $validator->addRequiredField('Foo'); |
|
40 | - |
|
41 | - $this->assertEquals(['Foo'], $form->getValidator()->getRequired()); |
|
42 | - } |
|
43 | - |
|
44 | - |
|
45 | - public function testFields() |
|
46 | - { |
|
47 | - $form = LocatorForm::create(LocatorController::create(Locator::get()->first()), 'LocatorForm'); |
|
48 | - $this->assertInstanceOf(FieldList::class, $form->Fields()); |
|
49 | - } |
|
50 | - |
|
51 | - |
|
52 | - public function testActions() |
|
53 | - { |
|
54 | - $form = LocatorForm::create(LocatorController::create(Locator::get()->first()), 'LocatorForm'); |
|
55 | - $this->assertInstanceOf(FieldList::class, $form->Actions()); |
|
56 | - } |
|
14 | + /** |
|
15 | + * @var string |
|
16 | + */ |
|
17 | + protected static $fixture_file = '../fixtures.yml'; |
|
18 | + |
|
19 | + /** |
|
20 | + * |
|
21 | + */ |
|
22 | + public function testLocatorFormBase() |
|
23 | + { |
|
24 | + $form = LocatorForm::create(LocatorController::create(Locator::get()->first()), 'LocatorForm'); |
|
25 | + |
|
26 | + $this->assertInstanceOf(FieldList::class, $form->Fields()); |
|
27 | + $this->assertInstanceOf(RequiredFields::class, $form->getValidator()); |
|
28 | + } |
|
29 | + |
|
30 | + /** |
|
31 | + * |
|
32 | + */ |
|
33 | + public function testUpdateRequiredFields() |
|
34 | + { |
|
35 | + $form = LocatorForm::create(LocatorController::create(Locator::get()->first()), 'LocatorForm'); |
|
36 | + $validator = $form->getValidator(); |
|
37 | + |
|
38 | + $validator->removeRequiredField('Address'); |
|
39 | + $validator->addRequiredField('Foo'); |
|
40 | + |
|
41 | + $this->assertEquals(['Foo'], $form->getValidator()->getRequired()); |
|
42 | + } |
|
43 | + |
|
44 | + |
|
45 | + public function testFields() |
|
46 | + { |
|
47 | + $form = LocatorForm::create(LocatorController::create(Locator::get()->first()), 'LocatorForm'); |
|
48 | + $this->assertInstanceOf(FieldList::class, $form->Fields()); |
|
49 | + } |
|
50 | + |
|
51 | + |
|
52 | + public function testActions() |
|
53 | + { |
|
54 | + $form = LocatorForm::create(LocatorController::create(Locator::get()->first()), 'LocatorForm'); |
|
55 | + $this->assertInstanceOf(FieldList::class, $form->Actions()); |
|
56 | + } |
|
57 | 57 | } |
@@ -12,80 +12,80 @@ |
||
12 | 12 | class LocationAdmin extends ModelAdmin |
13 | 13 | { |
14 | 14 | |
15 | - /** |
|
16 | - * @var array |
|
17 | - */ |
|
18 | - private static $managed_models = array( |
|
19 | - Location::class, |
|
20 | - LocationCategory::class, |
|
21 | - ); |
|
15 | + /** |
|
16 | + * @var array |
|
17 | + */ |
|
18 | + private static $managed_models = array( |
|
19 | + Location::class, |
|
20 | + LocationCategory::class, |
|
21 | + ); |
|
22 | 22 | |
23 | - /** |
|
24 | - * @var array |
|
25 | - */ |
|
26 | - private static $model_importers = array( |
|
27 | - Location::class => LocationCsvBulkLoader::class, |
|
28 | - LocationCategory::class => CsvBulkLoader::class, |
|
29 | - ); |
|
23 | + /** |
|
24 | + * @var array |
|
25 | + */ |
|
26 | + private static $model_importers = array( |
|
27 | + Location::class => LocationCsvBulkLoader::class, |
|
28 | + LocationCategory::class => CsvBulkLoader::class, |
|
29 | + ); |
|
30 | 30 | |
31 | - /** |
|
32 | - * @var string |
|
33 | - */ |
|
34 | - private static $menu_title = 'Locator'; |
|
35 | - /** |
|
36 | - * @var string |
|
37 | - */ |
|
38 | - private static $url_segment = 'locator'; |
|
31 | + /** |
|
32 | + * @var string |
|
33 | + */ |
|
34 | + private static $menu_title = 'Locator'; |
|
35 | + /** |
|
36 | + * @var string |
|
37 | + */ |
|
38 | + private static $url_segment = 'locator'; |
|
39 | 39 | |
40 | - /** |
|
41 | - * @return array |
|
42 | - */ |
|
43 | - public function getExportFields() |
|
44 | - { |
|
45 | - if ($this->modelClass == Location::class) { |
|
46 | - $fields = [ |
|
47 | - 'Title' => 'Name', |
|
48 | - 'Address' => 'Address', |
|
49 | - 'Address2' => 'Address2', |
|
50 | - 'City' => 'City', |
|
51 | - 'State' => 'State', |
|
52 | - 'PostalCode' => 'PostalCode', |
|
53 | - 'CountryCode' => 'Country', |
|
54 | - 'Phone' => 'Phone', |
|
55 | - 'Fax' => 'Fax', |
|
56 | - 'Email' => 'Email', |
|
57 | - 'Website' => 'Website', |
|
58 | - 'Featured' => 'Featured', |
|
59 | - 'CategoryList' => 'Categories', |
|
60 | - 'Lat' => 'Lat', |
|
61 | - 'Lng' => 'Lng', |
|
62 | - 'Import_ID' => 'Import_ID', |
|
63 | - ]; |
|
64 | - } |
|
40 | + /** |
|
41 | + * @return array |
|
42 | + */ |
|
43 | + public function getExportFields() |
|
44 | + { |
|
45 | + if ($this->modelClass == Location::class) { |
|
46 | + $fields = [ |
|
47 | + 'Title' => 'Name', |
|
48 | + 'Address' => 'Address', |
|
49 | + 'Address2' => 'Address2', |
|
50 | + 'City' => 'City', |
|
51 | + 'State' => 'State', |
|
52 | + 'PostalCode' => 'PostalCode', |
|
53 | + 'CountryCode' => 'Country', |
|
54 | + 'Phone' => 'Phone', |
|
55 | + 'Fax' => 'Fax', |
|
56 | + 'Email' => 'Email', |
|
57 | + 'Website' => 'Website', |
|
58 | + 'Featured' => 'Featured', |
|
59 | + 'CategoryList' => 'Categories', |
|
60 | + 'Lat' => 'Lat', |
|
61 | + 'Lng' => 'Lng', |
|
62 | + 'Import_ID' => 'Import_ID', |
|
63 | + ]; |
|
64 | + } |
|
65 | 65 | |
66 | - if (!isset($fields)) { |
|
67 | - $fields = parent::getExportFields(); |
|
68 | - } |
|
66 | + if (!isset($fields)) { |
|
67 | + $fields = parent::getExportFields(); |
|
68 | + } |
|
69 | 69 | |
70 | - $this->extend('updateGetExportFields', $fields); |
|
70 | + $this->extend('updateGetExportFields', $fields); |
|
71 | 71 | |
72 | - return $fields; |
|
73 | - } |
|
72 | + return $fields; |
|
73 | + } |
|
74 | 74 | |
75 | - /** |
|
76 | - * @param null $id |
|
77 | - * @param null $fields |
|
78 | - * @return $this|Form |
|
79 | - */ |
|
80 | - public function getEditForm($id = null, $fields = null) |
|
81 | - { |
|
82 | - $form = parent::getEditForm($id, $fields); |
|
83 | - $class = $this->sanitiseClassName($this->modelClass); |
|
84 | - if ($class == Location::class) { |
|
85 | - $gridField = $form->Fields()->fieldByName($class); |
|
86 | - $config = $gridField->getConfig(); |
|
87 | - $config->removeComponentsByType('GridFieldDeleteAction'); |
|
88 | - } |
|
89 | - return $form; |
|
90 | - } |
|
75 | + /** |
|
76 | + * @param null $id |
|
77 | + * @param null $fields |
|
78 | + * @return $this|Form |
|
79 | + */ |
|
80 | + public function getEditForm($id = null, $fields = null) |
|
81 | + { |
|
82 | + $form = parent::getEditForm($id, $fields); |
|
83 | + $class = $this->sanitiseClassName($this->modelClass); |
|
84 | + if ($class == Location::class) { |
|
85 | + $gridField = $form->Fields()->fieldByName($class); |
|
86 | + $config = $gridField->getConfig(); |
|
87 | + $config->removeComponentsByType('GridFieldDeleteAction'); |
|
88 | + } |
|
89 | + return $form; |
|
90 | + } |
|
91 | 91 | } |
@@ -13,89 +13,89 @@ |
||
13 | 13 | class LocationCsvBulkLoader extends CsvBulkLoader |
14 | 14 | { |
15 | 15 | |
16 | - /** |
|
17 | - * @var array |
|
18 | - */ |
|
19 | - public $columnMap = array( |
|
20 | - 'Name' => 'Title', |
|
21 | - 'EmailAddress' => 'Email', |
|
22 | - 'Categories' => '->getCategoryByName', |
|
23 | - 'Import_ID' => 'Import_ID', |
|
24 | - 'Country' => '->getCountryByName', |
|
25 | - ); |
|
16 | + /** |
|
17 | + * @var array |
|
18 | + */ |
|
19 | + public $columnMap = array( |
|
20 | + 'Name' => 'Title', |
|
21 | + 'EmailAddress' => 'Email', |
|
22 | + 'Categories' => '->getCategoryByName', |
|
23 | + 'Import_ID' => 'Import_ID', |
|
24 | + 'Country' => '->getCountryByName', |
|
25 | + ); |
|
26 | 26 | |
27 | - /** |
|
28 | - * @var array |
|
29 | - */ |
|
30 | - public $duplicateChecks = array( |
|
31 | - 'Import_ID' => 'Import_ID' |
|
32 | - ); |
|
27 | + /** |
|
28 | + * @var array |
|
29 | + */ |
|
30 | + public $duplicateChecks = array( |
|
31 | + 'Import_ID' => 'Import_ID' |
|
32 | + ); |
|
33 | 33 | |
34 | - /** |
|
35 | - * @param $val |
|
36 | - * @return string|string[]|null |
|
37 | - */ |
|
38 | - public function getEscape($val) |
|
39 | - { |
|
40 | - return preg_replace("/\r|\n/", "", $val); |
|
41 | - } |
|
34 | + /** |
|
35 | + * @param $val |
|
36 | + * @return string|string[]|null |
|
37 | + */ |
|
38 | + public function getEscape($val) |
|
39 | + { |
|
40 | + return preg_replace("/\r|\n/", "", $val); |
|
41 | + } |
|
42 | 42 | |
43 | - /** |
|
44 | - * @param $obj |
|
45 | - * @param $val |
|
46 | - * @param $record |
|
47 | - * @throws \SilverStripe\ORM\ValidationException |
|
48 | - */ |
|
49 | - public static function getCategoryByName(&$obj, $val, $record) |
|
50 | - { |
|
51 | - $val = Convert::raw2sql($val); |
|
52 | - $parts = explode(', ', $val); |
|
43 | + /** |
|
44 | + * @param $obj |
|
45 | + * @param $val |
|
46 | + * @param $record |
|
47 | + * @throws \SilverStripe\ORM\ValidationException |
|
48 | + */ |
|
49 | + public static function getCategoryByName(&$obj, $val, $record) |
|
50 | + { |
|
51 | + $val = Convert::raw2sql($val); |
|
52 | + $parts = explode(', ', $val); |
|
53 | 53 | |
54 | - foreach ($parts as $part) { |
|
55 | - $category = LocationCategory::get()->filter(array('Name' => $part))->first(); |
|
56 | - if (!$category) { |
|
57 | - $category = LocationCategory::create(); |
|
58 | - $category->Name = $part; |
|
59 | - $category->write(); |
|
60 | - } |
|
61 | - $obj->Categories()->add($category); |
|
62 | - } |
|
63 | - } |
|
54 | + foreach ($parts as $part) { |
|
55 | + $category = LocationCategory::get()->filter(array('Name' => $part))->first(); |
|
56 | + if (!$category) { |
|
57 | + $category = LocationCategory::create(); |
|
58 | + $category->Name = $part; |
|
59 | + $category->write(); |
|
60 | + } |
|
61 | + $obj->Categories()->add($category); |
|
62 | + } |
|
63 | + } |
|
64 | 64 | |
65 | - /** |
|
66 | - * @param $obj |
|
67 | - * @param $val |
|
68 | - * @param $record |
|
69 | - */ |
|
70 | - public function getCountryByName(&$obj, $val, $record) |
|
71 | - { |
|
72 | - $val = $this->getEscape($val); |
|
73 | - $countries = IntlLocales::singleton()->getCountries(); |
|
65 | + /** |
|
66 | + * @param $obj |
|
67 | + * @param $val |
|
68 | + * @param $record |
|
69 | + */ |
|
70 | + public function getCountryByName(&$obj, $val, $record) |
|
71 | + { |
|
72 | + $val = $this->getEscape($val); |
|
73 | + $countries = IntlLocales::singleton()->getCountries(); |
|
74 | 74 | |
75 | - if (strlen((string)$val) == 2) { |
|
76 | - $val = strtolower($val); |
|
77 | - if (array_key_exists($val, $countries)) { |
|
78 | - $obj->Country = $val; |
|
79 | - } |
|
80 | - } |
|
75 | + if (strlen((string)$val) == 2) { |
|
76 | + $val = strtolower($val); |
|
77 | + if (array_key_exists($val, $countries)) { |
|
78 | + $obj->Country = $val; |
|
79 | + } |
|
80 | + } |
|
81 | 81 | |
82 | - if (in_array($val, $countries)) { |
|
83 | - $obj->Country = array_search($val, $countries); |
|
84 | - } |
|
85 | - } |
|
82 | + if (in_array($val, $countries)) { |
|
83 | + $obj->Country = array_search($val, $countries); |
|
84 | + } |
|
85 | + } |
|
86 | 86 | |
87 | - /** |
|
88 | - * @param array $record |
|
89 | - * @param array $columnMap |
|
90 | - * @param \SilverStripe\Dev\BulkLoader_Result $results |
|
91 | - * @param bool $preview |
|
92 | - * @return int|void |
|
93 | - */ |
|
94 | - protected function processRecord($record, $columnMap, &$results, $preview = false) |
|
95 | - { |
|
96 | - $objID = parent::processRecord($record, $columnMap, $results, $preview = false); |
|
87 | + /** |
|
88 | + * @param array $record |
|
89 | + * @param array $columnMap |
|
90 | + * @param \SilverStripe\Dev\BulkLoader_Result $results |
|
91 | + * @param bool $preview |
|
92 | + * @return int|void |
|
93 | + */ |
|
94 | + protected function processRecord($record, $columnMap, &$results, $preview = false) |
|
95 | + { |
|
96 | + $objID = parent::processRecord($record, $columnMap, $results, $preview = false); |
|
97 | 97 | |
98 | - $location = Location::get()->byID($objID); |
|
99 | - $location->publishSingle(); |
|
100 | - } |
|
98 | + $location = Location::get()->byID($objID); |
|
99 | + $location->publishSingle(); |
|
100 | + } |
|
101 | 101 | } |
@@ -72,7 +72,7 @@ |
||
72 | 72 | $val = $this->getEscape($val); |
73 | 73 | $countries = IntlLocales::singleton()->getCountries(); |
74 | 74 | |
75 | - if (strlen((string)$val) == 2) { |
|
75 | + if (strlen((string) $val) == 2) { |
|
76 | 76 | $val = strtolower($val); |
77 | 77 | if (array_key_exists($val, $countries)) { |
78 | 78 | $obj->Country = $val; |