MAGETWO-54460: Admin user with access to only one website is unable to edit a product

Author: Alex Paliarush

app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder.php

@@ -159,7 +159,9 @@ public function reindexByIds(array $ids)
             $this->doReindexByIds($ids);
         } catch (\Exception $e) {
             $this->critical($e);
-            throw new \Magento\Framework\Exception\LocalizedException(__($e->getMessage()), $e);
+            throw new \Magento\Framework\Exception\LocalizedException(
+                __("Catalog rule indexing failed. See details in exception log.")
+            );
         }
     }
 
@@ -193,7 +195,9 @@ public function reindexFull()
             $this->doReindexFull();
         } catch (\Exception $e) {
             $this->critical($e);
-            throw new \Magento\Framework\Exception\LocalizedException(__($e->getMessage()), $e);
+            throw new \Magento\Framework\Exception\LocalizedException(
+                __("Catalog rule indexing failed. See details in exception log.")
+            );
         }
     }
 

app/code/Magento/Rule/Model/ResourceModel/Rule/Collection/AbstractCollection.php

@@ -74,15 +74,18 @@ public function addWebsitesToResult($flag = null)
      */
     public function addWebsiteFilter($websiteId)
     {
-        $entityInfo = $this->_getAssociatedEntityInfo('website');
         if (!$this->getFlag('is_website_table_joined')) {
+            $websiteIds = is_array($websiteId) ? $websiteId : [$websiteId];
+            $entityInfo = $this->_getAssociatedEntityInfo('website');
             $this->setFlag('is_website_table_joined', true);
-            if ($websiteId instanceof \Magento\Store\Model\Website) {
-                $websiteId = $websiteId->getId();
+            foreach ($websiteIds as $index => $website) {
+                if ($website instanceof \Magento\Store\Model\Website) {
+                    $websiteIds[$index] = $website->getId();
+                }
             }
             $this->getSelect()->join(
                 ['website' => $this->getTable($entityInfo['associations_table'])],
-                $this->getConnection()->quoteInto('website.' . $entityInfo['entity_id_field'] . ' = ?', $websiteId)
+                $this->getConnection()->quoteInto('website.' . $entityInfo['entity_id_field'] . ' IN (?)', $websiteIds)
                 . ' AND main_table.' . $entityInfo['rule_id_field'] . ' = website.' . $entityInfo['rule_id_field'],
                 []
             );