36422: Only Update Indexer Mode When Required

Author: engcom-Charlie

app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassChangelog.php

@@ -24,16 +24,27 @@ public function execute()
         if (!is_array($indexerIds)) {
             $this->messageManager->addErrorMessage(__('Please select indexers.'));
         } else {
+            $updatedIndexersCount = 0;
+
             try {
                 foreach ($indexerIds as $indexerId) {
                     /** @var \Magento\Framework\Indexer\IndexerInterface $model */
                     $model = $this->_objectManager->get(
                         \Magento\Framework\Indexer\IndexerRegistry::class
                     )->get($indexerId);
-                    $model->setScheduled(true);
+
+                    if (!$model->isScheduled()) {
+                        $model->setScheduled(true);
+                        $updatedIndexersCount++;
+                    }
                 }
-                $this->messageManager->addSuccess(
-                    __('%1 indexer(s) are in "Update by Schedule" mode.', count($indexerIds))
+
+                $this->messageManager->addSuccessMessage(
+                    __(
+                        '%1 indexer(s) have been updated to "Update by Schedule" mode. %2 skipped because there was nothing to change.',
+                        $updatedIndexersCount,
+                        count($indexerIds) - $updatedIndexersCount
+                    )
                 );
             } catch (\Magento\Framework\Exception\LocalizedException $e) {
                 $this->messageManager->addErrorMessage($e->getMessage());

app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassOnTheFly.php

@@ -24,16 +24,27 @@ public function execute()
         if (!is_array($indexerIds)) {
             $this->messageManager->addErrorMessage(__('Please select indexers.'));
         } else {
+            $updatedIndexersCount = 0;
+
             try {
                 foreach ($indexerIds as $indexerId) {
                     /** @var \Magento\Framework\Indexer\IndexerInterface $model */
                     $model = $this->_objectManager->get(
                         \Magento\Framework\Indexer\IndexerRegistry::class
                     )->get($indexerId);
-                    $model->setScheduled(false);
+
+                    if ($model->isScheduled()) {
+                        $model->setScheduled(false);
+                        $updatedIndexersCount++;
+                    }
                 }
-                $this->messageManager->addSuccess(
-                    __('%1 indexer(s) are in "Update on Save" mode.', count($indexerIds))
+
+                $this->messageManager->addSuccessMessage(
+                    __(
+                        '%1 indexer(s) have been updated to "Update on Save" mode. %2 skipped because there was nothing to change.',
+                        $updatedIndexersCount,
+                        count($indexerIds) - $updatedIndexersCount
+                    )
                 );
             } catch (\Magento\Framework\Exception\LocalizedException $e) {
                 $this->messageManager->addErrorMessage($e->getMessage());