Merge branch '2.1' into 2

silverstripe · Nov 4, 2023 · c3142e4 · c3142e4
2 parents c1743fb + fbfbde4
commit c3142e4
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 8 deletions.
diff --git a/client/src/containers/CampaignAdmin/CampaignAdmin.js b/client/src/containers/CampaignAdmin/CampaignAdmin.js
@@ -92,7 +92,6 @@ class CampaignAdmin extends Component {
         // NOOP - Lazy loaded in CampaignAdminList.js
         break;
       case 'edit':
-        // @todo - Lazy load in FormBuilderLoader / GridField
         breadcrumbs.push({
           text: title,
           href: this.getActionRoute(id, view),

diff --git a/client/src/containers/CampaignAdmin/CampaignAdminItem.js b/client/src/containers/CampaignAdmin/CampaignAdminItem.js
@@ -114,8 +114,6 @@ class CampaignAdminItem extends Component {
     const badge = {};
     const { campaign, item } = this.props;
 
-    // @todo customise these status messages for already-published changesets
-
     // Change badge. If the campaign has been published,
     // don't apply a badge at all
     if (campaign.State === 'open') {

diff --git a/src/CampaignAdmin.php b/src/CampaignAdmin.php
@@ -118,7 +118,6 @@ public function getClientConfig()
         return array_merge(parent::getClientConfig(), [
             'reactRouter' => true,
             'form' => [
-                // TODO Use schemaUrl instead
                 'EditForm' => [
                     'schemaUrl' => $this->Link('schema/EditForm')
                 ],
@@ -601,9 +600,6 @@ public function campaignEditForm($request)
     }
 
     /**
-     * @todo Use GridFieldDetailForm once it can handle structured data and form schemas
-     * @todo move to FormBuilder
-     *
      * @param int $id
      * @return Form
      */
@@ -684,7 +680,6 @@ public function campaignCreateForm($request)
 
     /**
      * Build create form
-     * @todo Move to form builder
      *
      * @return Form
      */