Merge branch '3.1' into 3

client/src/js/LeftAndMain_Subsites.js

@@ -61,9 +61,6 @@
     });
 
     $('.cms-edit-form').entwine({
-      /**
-       * TODO: Fix with Entwine API extension. See https://github.com/silverstripe/silverstripe-subsites/pull/125
-       */
       getChangeTrackerOptions() {
         // Figure out if we're still returning the default value
         const isDefault = (this.entwineData('ChangeTrackerOptions') === undefined);

client/src/js/SubsitesTreeDropdownField.js

@@ -8,7 +8,6 @@
      */
     $('select.subsitestreedropdownfield-chooser').entwine({
       onchange() {
-        // TODO Data binding between two fields
         const name = this.attr('name').replace('_SubsiteID', '');
         const field = $(`#Form_EditForm_${name}`).first();
         field.setValue(0);

lang/fr.yml

@@ -1,5 +1,6 @@
 fr:
   SilverStripe\Subsites\Model\Subsite:
+    ConfigurationTab: Configuration
     CustomExtraMeta: 'Balises Méta personnalisées'
     CustomMetaDescription: Description
     CustomMetaTitle: Titre

lang/nl.yml

@@ -21,6 +21,7 @@ nl:
     MANAGE_SUBSITES: 'Beheer subsites voor groepen'
     MANAGE_SUBSITES_HELP: 'Bepaal de toegangsrechten voor groepen per subsite'
     SECURITYTABTITLE: Subsites
+    db_AccessAllSubsites: 'Toegang tot alle subsites'
     many_many_Subsites: Subsites
   SilverStripe\Subsites\Extensions\LeftAndMainSubsites:
     SITECONTENTLEFT: 'Site inhoud'

src/Extensions/ErrorPageSubsite.php

@@ -49,7 +49,6 @@ class ErrorPageSubsite extends DataExtension
         }
 
         $fileName = FileNameFilter::create()->filter("error-{$statusCode}{$subdomainPart}.html");
-
         $name = implode('/', [$static_filepath, $fileName]);
     }
 }

src/Extensions/FileSubsites.php

@@ -56,10 +56,7 @@ class FileSubsites extends DataExtension
             return;
         }
 
-        // If you're querying by ID, ignore the sub-site - this is a bit ugly... (but it was WAYYYYYYYYY worse)
-        // @TODO I don't think excluding if SiteTree_ImageTracking is a good idea however because of the SS 3.0 api and
-        // ManyManyList::removeAll() changing the from table after this function is called there isn't much of a choice
-
+        // If you're querying by ID, ignore the sub-site
         $from = $query->getFrom();
         if (isset($from['SiteTree_ImageTracking']) || $query->filtersOnID()) {
             return;

src/Extensions/SiteTreeSubsites.php

@@ -140,9 +140,6 @@ class SiteTreeSubsites extends DataExtension
             );
 
             $copyAction->addExtraClass('btn btn-primary font-icon-save ml-3');
-
-            // @todo check if this needs re-implementation
-//            $copyAction->includeDefaultJS(false);
         }
 
         // replace readonly link prefix

src/Forms/GridFieldSubsiteDetailFormItemRequest.php

@@ -18,10 +18,6 @@ class GridFieldSubsiteDetailFormItemRequest extends GridFieldDetailForm_ItemRequ
      * Builds an item edit form.  The arguments to getCMSFields() are the popupController and
      * popupFormName, however this is an experimental API and may change.
      *
-     * @todo In the future, we will probably need to come up with a tigher object representing a partially
-     * complete controller with gaps for extra functionality.  This, for example, would be a better way
-     * of letting Security/login put its log-in form inside a UI specified elsewhere.
-     *
      * @return Form
      * @see GridFieldDetailForm_ItemRequest::ItemEditForm()
      */

src/Model/Subsite.php

@@ -583,7 +583,6 @@ class Subsite extends DataObject
      * If more than one permission is passed to the method, at least one of them must
      * be granted for if to return TRUE.
      *
-     * @todo Allow permission inheritance through group hierarchy.
      *
      * @param Member Member to check against. Defaults to currently logged in member
      * @param array $permissionCodes
@@ -641,7 +640,6 @@ class Subsite extends DataObject
     }
 
     /**
-     * @todo Possible security issue, don't grant edit permissions to everybody.
      * @param bool $member
      * @return bool
      */

src/Model/SubsiteDomain.php

@@ -180,8 +180,6 @@ class SubsiteDomain extends DataObject
     /**
      * Retrieves domain name with wildcards substituted with actual values
      *
-     * @todo Refactor domains into separate wildcards / primary domains
-     *
      * @return string
      */
     public function getSubstitutedDomain()
@@ -193,7 +191,6 @@ class SubsiteDomain extends DataObject
         $domain = preg_replace('/\.\*$/', ".{$currentHost}", $this->Domain ?? '');
 
         // Default to "subsite." prefix for first wildcard
-        // TODO Whats the significance of "subsite" in this context?!
         $domain = preg_replace('/^\*\./', "subsite.", $domain ?? '');
 
         // *Only* removes "intermediate" subdomains, so 'subdomain.www.domain.com' becomes 'subdomain.domain.com'

tests/php/SiteTreeSubsitesTest.php

@@ -138,7 +138,6 @@ class SiteTreeSubsitesTest extends BaseSubsiteTest
             'Administrators can edit all subsites'
         );
 
-        // @todo: Workaround because GroupSubsites->augmentSQL() is relying on session state
         Subsite::changeSubsite($subsite1);
 
         $this->logInAs($subsite1member->ID);
@@ -153,7 +152,6 @@ class SiteTreeSubsitesTest extends BaseSubsiteTest
             'Members cant edit pages on a subsite if they are not in a group belonging to this subsite'
         );
 
-        // @todo: Workaround because GroupSubsites->augmentSQL() is relying on session state
         Subsite::changeSubsite(0);
         $this->assertFalse(
             $mainpage->canEdit(),