@@ -3,11 +3,9 @@ |
||
3 | 3 | namespace SheaDawson\Blocks; |
4 | 4 | |
5 | 5 | use SilverStripe\ORM\ArrayLib; |
6 | -use SilverStripe\SiteConfig\SiteConfig; |
|
7 | 6 | use SilverStripe\Core\Config\Config; |
8 | 7 | use SilverStripe\Core\ClassInfo; |
9 | 8 | use SilverStripe\Forms\FormField; |
10 | -use SilverStripe\View\SSViewer; |
|
11 | 9 | use SilverStripe\View\ViewableData; |
12 | 10 | |
13 | 11 | /** |
@@ -48,7 +48,7 @@ |
||
48 | 48 | } |
49 | 49 | |
50 | 50 | /** |
51 | - * @return Form |
|
51 | + * @return \SilverStripe\Forms\Form |
|
52 | 52 | **/ |
53 | 53 | public function getEditForm($id = null, $fields = null) |
54 | 54 | { |
@@ -267,6 +267,7 @@ |
||
267 | 267 | /** |
268 | 268 | * Get all Blocks from BlockSets that apply to this page. |
269 | 269 | * |
270 | + * @param string $area |
|
270 | 271 | * @return ArrayList |
271 | 272 | * */ |
272 | 273 | public function getBlocksFromAppliedBlockSets($area = null, $includeDisabled = false) |
@@ -3,7 +3,6 @@ discard block |
||
3 | 3 | namespace SheaDawson\Blocks\Extensions; |
4 | 4 | |
5 | 5 | use SheaDawson\Blocks\Model\Block; |
6 | -use SheaDawson\Blocks\Model\Blockset; |
|
7 | 6 | use SheaDawson\Blocks\BlockManager; |
8 | 7 | use SheaDawson\Blocks\Forms\GridFieldConfigBlockManager; |
9 | 8 | use SilverStripe\CMS\Model\SiteTreeExtension; |
@@ -18,7 +17,6 @@ discard block |
||
18 | 17 | use SilverStripe\ORM\ArrayList; |
19 | 18 | use SilverStripe\Security\Permission; |
20 | 19 | use SilverStripe\Control\Controller; |
21 | -use SilverStripeAustralia\GridFieldExtensions\GridFieldOrderableRows; |
|
22 | 20 | |
23 | 21 | /** |
24 | 22 | * BlocksSiteTreeExtension. |
@@ -126,7 +126,7 @@ discard block |
||
126 | 126 | protected $controller; |
127 | 127 | |
128 | 128 | /** |
129 | - * @return mixed |
|
129 | + * @return string |
|
130 | 130 | */ |
131 | 131 | public function getTypeForGridfield() |
132 | 132 | { |
@@ -237,7 +237,7 @@ discard block |
||
237 | 237 | * looks for templates that match BlockClassName_AreaName |
238 | 238 | * falls back to BlockClassName. |
239 | 239 | * |
240 | - * @return string |
|
240 | + * @return DBHTMLText |
|
241 | 241 | **/ |
242 | 242 | public function forTemplate() |
243 | 243 | { |
@@ -253,7 +253,7 @@ discard block |
||
253 | 253 | } |
254 | 254 | |
255 | 255 | /** |
256 | - * @return string |
|
256 | + * @return DBHTMLText |
|
257 | 257 | */ |
258 | 258 | public function BlockHTML() |
259 | 259 | { |
@@ -428,7 +428,7 @@ discard block |
||
428 | 428 | /** |
429 | 429 | * Check if this block has been published. |
430 | 430 | * |
431 | - * @return bool True if this page has been published. |
|
431 | + * @return string True if this page has been published. |
|
432 | 432 | */ |
433 | 433 | public function isPublishedNice() |
434 | 434 | { |
@@ -126,7 +126,7 @@ |
||
126 | 126 | /** |
127 | 127 | * Returns a list of pages this BlockSet features on. |
128 | 128 | * |
129 | - * @return DataList |
|
129 | + * @return \SilverStripe\ORM\DataList |
|
130 | 130 | */ |
131 | 131 | public function Pages() |
132 | 132 | { |
@@ -2,13 +2,11 @@ |
||
2 | 2 | |
3 | 3 | namespace SheaDawson\Blocks\Model; |
4 | 4 | |
5 | -use SheaDawson\Blocks\Forms\GridFieldConfigBlockManager; |
|
6 | 5 | use SilverStripe\ORM\DataObject; |
7 | 6 | use SilverStripe\ORM\ArrayLib; |
8 | 7 | use SilverStripe\CMS\Model\SiteTree; |
9 | 8 | use SilverStripe\Security\PermissionProvider; |
10 | 9 | use SilverStripe\Security\Permission; |
11 | -use SilverStripe\Security\Group; |
|
12 | 10 | use SilverStripe\Forms\TreeMultiselectField; |
13 | 11 | use SilverStripe\Forms\CheckboxField; |
14 | 12 | use SilverStripe\Forms\HeaderField; |