Improve UI/UX for Terms and Conditions Review (CFM-501) #419
+499
−340
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Ioannis
approved these changes
Jun 16, 2026
benno
requested changes
Jun 26, 2026
app/plugins/TermsAgreer/templates/AgreementCollectors/dispatch.inc
Outdated
Show resolved
Hide resolved
arlen
force-pushed
the
feature-cfm501-tcReview
branch
from
78f7593 to
1d5da04
Compare
Contributor
Author
|
All fixes made and PR rebased against the latest develop. |
benno
reviewed
Jun 27, 2026
arlen
force-pushed
the
feature-cfm501-tcReview
branch
from
1d5da04 to
44504dc
Compare
arlen
force-pushed
the
feature-cfm501-tcReview
branch
from
44504dc to
c776d50
Compare
benno
reviewed
Jul 21, 2026
Comment on lines
+711
to
+713
| if($this->request->is('ajax')) { | ||
| return; | ||
| } |
Contributor
There was a problem hiding this comment.
This check should move into AppController where we're already doing various tests before deciding whether to call maybeEnforceTAndCs().
| @@ -181,23 +181,66 @@ public function review() { | |||
|
|
|||
| $status = $this->TermsAndConditions->status((int)$personId); | |||
|
|
|||
| // If there is nothing left to do, redirect to the original request | |||
| $done = true; | |||
| if($request->is('post')) { | |||
Contributor
There was a problem hiding this comment.
Aren't T&C now being recorded over the API? In which case they wouldn't get processed by review()?
Sign in
to join this conversation on GitHub.
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR moves the plugins/TermsAgreer interface into the core Terms and Conditions interface for CO-level Terms and Conditions Review. The plugin now uses the core interface template (using an include). The result looks like the following screenshots: