@@ -8,7 +8,6 @@ |
||
8 | 8 | use SilverStripe\ORM\DataObject; |
9 | 9 | use SilverStripe\ORM\FieldType\DBDatetime; |
10 | 10 | use SilverStripe\Translatable\Model\Translatable; |
11 | -use SilverStripe\Security\Member; |
|
12 | 11 | use SilverStripe\Subsites\Extensions\SiteTreeSubsites; |
13 | 12 | use SilverStripe\Versioned\Versioned; |
14 | 13 | use Symbiote\AdvancedWorkflow\DataObjects\WorkflowAction; |
@@ -3,8 +3,6 @@ |
||
3 | 3 | namespace Symbiote\AdvancedWorkflow\Actions; |
4 | 4 | |
5 | 5 | use SilverStripe\Forms\CheckboxField; |
6 | -use SilverStripe\Forms\FieldGroup; |
|
7 | -use SilverStripe\Forms\LabelField; |
|
8 | 6 | use SilverStripe\Forms\NumericField; |
9 | 7 | use SilverStripe\ORM\DataObject; |
10 | 8 | use Symbiote\AdvancedWorkflow\DataObjects\WorkflowAction; |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | * - required fields from the Context Object |
95 | 95 | * - Actions from the connected WorkflowTransitions |
96 | 96 | * |
97 | - * @return Form |
|
97 | + * @return null|FrontendWorkflowForm |
|
98 | 98 | */ |
99 | 99 | public function Form() |
100 | 100 | { |
@@ -150,7 +150,7 @@ discard block |
||
150 | 150 | * |
151 | 151 | * @param array $data |
152 | 152 | * @param Form $form |
153 | - * @param SS_HTTPRequest $request |
|
153 | + * @param HTTPRequest $request |
|
154 | 154 | * @throws Exception |
155 | 155 | */ |
156 | 156 | public function doFrontEndAction(array $data, Form $form, HTTPRequest $request) |
@@ -5,7 +5,6 @@ |
||
5 | 5 | use SilverStripe\Forms\CheckboxField; |
6 | 6 | use SilverStripe\Forms\DropdownField; |
7 | 7 | use SilverStripe\Forms\FieldList; |
8 | -use SilverStripe\Forms\ReadonlyField; |
|
9 | 8 | use SilverStripe\Forms\RequiredFields; |
10 | 9 | use SilverStripe\Forms\TabSet; |
11 | 10 | use SilverStripe\Forms\TextField; |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | * Admin level users can always edit. |
76 | 76 | * |
77 | 77 | * @param DataObject $target |
78 | - * @return bool |
|
78 | + * @return boolean|null |
|
79 | 79 | */ |
80 | 80 | public function canEditTarget(DataObject $target) |
81 | 81 | { |
@@ -91,7 +91,7 @@ discard block |
||
91 | 91 | * Does this action restrict viewing of the document? |
92 | 92 | * |
93 | 93 | * @param DataObject $target |
94 | - * @return bool |
|
94 | + * @return boolean|null |
|
95 | 95 | */ |
96 | 96 | public function canViewTarget(DataObject $target) |
97 | 97 | { |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | * Does this action restrict the publishing of a document? |
103 | 103 | * |
104 | 104 | * @param DataObject $target |
105 | - * @return bool |
|
105 | + * @return boolean|null |
|
106 | 106 | */ |
107 | 107 | public function canPublishTarget(DataObject $target) |
108 | 108 | { |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | * |
115 | 115 | * @param Member $member |
116 | 116 | * @param array $context |
117 | - * @return bool |
|
117 | + * @return boolean|string |
|
118 | 118 | */ |
119 | 119 | public function canCreate($member = null, $context = array()) |
120 | 120 | { |
@@ -123,7 +123,7 @@ discard block |
||
123 | 123 | |
124 | 124 | /** |
125 | 125 | * @param Member $member |
126 | - * @return bool |
|
126 | + * @return boolean|string |
|
127 | 127 | */ |
128 | 128 | public function canEdit($member = null) |
129 | 129 | { |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | |
133 | 133 | /** |
134 | 134 | * @param Member $member |
135 | - * @return bool |
|
135 | + * @return boolean|string |
|
136 | 136 | */ |
137 | 137 | public function canDelete($member = null) |
138 | 138 | { |
@@ -57,6 +57,7 @@ discard block |
||
57 | 57 | |
58 | 58 | /** |
59 | 59 | * Gets fields for when this is part of an active workflow |
60 | + * @param \SilverStripe\Forms\FieldList $fields |
|
60 | 61 | */ |
61 | 62 | public function updateWorkflowFields($fields) |
62 | 63 | { |
@@ -74,6 +75,9 @@ discard block |
||
74 | 75 | } |
75 | 76 | } |
76 | 77 | |
78 | + /** |
|
79 | + * @param \SilverStripe\Forms\FieldList $fields |
|
80 | + */ |
|
77 | 81 | public function updateFrontendWorkflowFields($fields) |
78 | 82 | { |
79 | 83 | if ($this->BaseAction()->AllowCommenting) { |
@@ -108,6 +112,9 @@ discard block |
||
108 | 112 | return $obj; |
109 | 113 | } |
110 | 114 | |
115 | + /** |
|
116 | + * @param \SilverStripe\Forms\FieldList $actions |
|
117 | + */ |
|
111 | 118 | public function updateFrontEndWorkflowActions($actions) |
112 | 119 | { |
113 | 120 | $ba = $this->BaseAction(); |
@@ -5,7 +5,6 @@ discard block |
||
5 | 5 | use SilverStripe\Control\Controller; |
6 | 6 | use SilverStripe\Forms\CheckboxSetField; |
7 | 7 | use SilverStripe\Forms\DropdownField; |
8 | -use SilverStripe\Forms\FieldGroup; |
|
9 | 8 | use SilverStripe\Forms\FieldList; |
10 | 9 | use SilverStripe\Forms\FormAction; |
11 | 10 | use SilverStripe\Forms\GridField\GridFieldConfig_RecordEditor; |
@@ -16,7 +15,6 @@ discard block |
||
16 | 15 | use SilverStripe\Forms\GridField\GridFieldViewButton; |
17 | 16 | use SilverStripe\Forms\GridField\GridFieldDetailForm; |
18 | 17 | use SilverStripe\Forms\GridField\GridFieldConfig_Base; |
19 | -use SilverStripe\Forms\LabelField; |
|
20 | 18 | use SilverStripe\Forms\LiteralField; |
21 | 19 | use SilverStripe\Forms\NumericField; |
22 | 20 | use SilverStripe\Forms\ReadonlyField; |
@@ -479,7 +479,7 @@ discard block |
||
479 | 479 | * |
480 | 480 | * @param $member |
481 | 481 | * @param $target |
482 | - * @return Boolean |
|
482 | + * @return boolean|string |
|
483 | 483 | */ |
484 | 484 | public function canWorkflowPublish($member, $target) |
485 | 485 | { |
@@ -494,7 +494,7 @@ discard block |
||
494 | 494 | * |
495 | 495 | * @param Member $member |
496 | 496 | * @param array $context |
497 | - * @return bool |
|
497 | + * @return boolean|string |
|
498 | 498 | */ |
499 | 499 | public function canCreate($member = null, $context = []) |
500 | 500 | { |
@@ -510,7 +510,7 @@ discard block |
||
510 | 510 | /** |
511 | 511 | * |
512 | 512 | * @param Member $member |
513 | - * @return boolean |
|
513 | + * @return boolean|null |
|
514 | 514 | */ |
515 | 515 | public function canView($member = null) |
516 | 516 | { |
@@ -520,7 +520,7 @@ discard block |
||
520 | 520 | /** |
521 | 521 | * |
522 | 522 | * @param Member $member |
523 | - * @return boolean |
|
523 | + * @return boolean|string |
|
524 | 524 | */ |
525 | 525 | public function canEdit($member = null) |
526 | 526 | { |
@@ -530,7 +530,7 @@ discard block |
||
530 | 530 | /** |
531 | 531 | * |
532 | 532 | * @param Member $member |
533 | - * @return boolean |
|
533 | + * @return boolean|string |
|
534 | 534 | * @see {@link $this->onBeforeDelete()} |
535 | 535 | */ |
536 | 536 | public function canDelete($member = null) |
@@ -558,7 +558,7 @@ discard block |
||
558 | 558 | * Checks whether the passed user is able to view this ModelAdmin |
559 | 559 | * |
560 | 560 | * @param Member $member |
561 | - * @return bool |
|
561 | + * @return boolean|null |
|
562 | 562 | */ |
563 | 563 | protected function userHasAccess($member) |
564 | 564 | { |
@@ -603,7 +603,7 @@ discard block |
||
603 | 603 | /** |
604 | 604 | * Does this action restrict the publishing of a document? |
605 | 605 | * |
606 | - * @return boolean |
|
606 | + * @return boolean|null |
|
607 | 607 | */ |
608 | 608 | public function canPublishTarget() |
609 | 609 | { |
@@ -616,7 +616,7 @@ discard block |
||
616 | 616 | * Get the current set of transitions that are valid for the current workflow state, |
617 | 617 | * and are available to the current user. |
618 | 618 | * |
619 | - * @return array |
|
619 | + * @return ArrayList |
|
620 | 620 | */ |
621 | 621 | public function validTransitions() |
622 | 622 | { |
@@ -750,9 +750,9 @@ discard block |
||
750 | 750 | * to view WorkflowInstances within GridFields |
751 | 751 | * @see {@link $this->userHasAccess()} |
752 | 752 | * |
753 | - * @param number $recordID |
|
753 | + * @param integer $recordID |
|
754 | 754 | * @param number $userID |
755 | - * @param number $wasPublished |
|
755 | + * @param integer $wasPublished |
|
756 | 756 | * @return boolean |
757 | 757 | */ |
758 | 758 | public function getVersionedConnection($recordID, $userID, $wasPublished = 0) |
@@ -789,7 +789,7 @@ discard block |
||
789 | 789 | /** |
790 | 790 | * Tells us if $member has had permissions over some part of the current WorkflowInstance. |
791 | 791 | * |
792 | - * @param $member |
|
792 | + * @param Member $member |
|
793 | 793 | * @return WorkflowAction|boolean |
794 | 794 | */ |
795 | 795 | public function getMostRecentActionForUser($member = null) |
@@ -217,7 +217,7 @@ discard block |
||
217 | 217 | * |
218 | 218 | * @param Member $member |
219 | 219 | * @param array $context |
220 | - * @return bool |
|
220 | + * @return boolean|string |
|
221 | 221 | */ |
222 | 222 | public function canCreate($member = null, $context = array()) |
223 | 223 | { |
@@ -226,7 +226,7 @@ discard block |
||
226 | 226 | |
227 | 227 | /** |
228 | 228 | * @param Member $member |
229 | - * @return bool |
|
229 | + * @return boolean|string |
|
230 | 230 | */ |
231 | 231 | public function canEdit($member = null) |
232 | 232 | { |
@@ -235,7 +235,7 @@ discard block |
||
235 | 235 | |
236 | 236 | /** |
237 | 237 | * @param Member $member |
238 | - * @return bool |
|
238 | + * @return boolean|string |
|
239 | 239 | */ |
240 | 240 | public function canDelete($member = null) |
241 | 241 | { |
@@ -535,7 +535,7 @@ |
||
535 | 535 | * disabled. |
536 | 536 | * |
537 | 537 | * @param Member $member |
538 | - * @return bool|null |
|
538 | + * @return false|null |
|
539 | 539 | */ |
540 | 540 | public function canEdit($member) |
541 | 541 | { |
@@ -4,16 +4,12 @@ |
||
4 | 4 | |
5 | 5 | use SilverStripe\Control\Controller; |
6 | 6 | use SilverStripe\Core\Injector\Injector; |
7 | -use SilverStripe\Core\Manifest\ModuleLoader; |
|
8 | 7 | use SilverStripe\Forms\FieldList; |
9 | 8 | use SilverStripe\Forms\DatetimeField; |
10 | 9 | use SilverStripe\Forms\HeaderField; |
11 | 10 | use SilverStripe\Forms\LiteralField; |
12 | -use SilverStripe\ORM\ArrayList; |
|
13 | 11 | use SilverStripe\ORM\DataExtension; |
14 | -use SilverStripe\ORM\DataQuery; |
|
15 | 12 | use SilverStripe\ORM\FieldType\DBDatetime; |
16 | -use SilverStripe\ORM\Queries\SQLSelect; |
|
17 | 13 | use SilverStripe\Security\Member; |
18 | 14 | use SilverStripe\Security\Permission; |
19 | 15 | use SilverStripe\View\Requirements; |