Merge pull request #100 from lmaucoin/master

New redirects always save with highest ID site
Dolphiq · Oct 7, 2019 · 0693184 · 0693184
2 parents 2b73c09 + 8ffafa9
commit 0693184
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/src/controllers/SettingsController.php b/src/controllers/SettingsController.php
@@ -352,6 +352,15 @@ public function actionSaveRedirect()
 
             return null;
         } else {
+          // remove form other sites
+          Craft::$app->getDb()->createCommand()
+            ->delete('{{%elements_sites}}', [
+              'AND',
+              ['elementId' => $redirect->id],
+              ['!=', 'siteId', $siteId]
+            ])
+            ->execute();
+
             if ($request->getAcceptsJson()) {
                 return $this->asJson([
                     'success' => true,

diff --git a/src/elements/Redirect.php b/src/elements/Redirect.php
@@ -346,14 +346,6 @@ public function afterSave(bool $isNew)
 
         $record->save(false);
 
-        // remove form other sites
-        Craft::$app->getDb()->createCommand()
-            ->delete('{{%elements_sites}}', [
-                'AND',
-                ['elementId' => $record->id],
-                ['!=', 'siteId', $this->siteId]
-            ])
-            ->execute();
         parent::afterSave($isNew);
     }