#10765 add confirmation and lock_expires labels to customer grid CSV…

… export
magento · Nov 21, 2017 · 74e1d85 · 74e1d85
1 parent 5f3ef1b
commit 74e1d85
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/code/Magento/Customer/Test/Unit/Ui/Component/DataProvider/DocumentTest.php b/app/code/Magento/Customer/Test/Unit/Ui/Component/DataProvider/DocumentTest.php
@@ -188,7 +188,6 @@ public function testGetConfirmationAttribute()
         static::assertEquals('Confirmed', (string)$value);
     }
 
-
     /**
      * @covers \Magento\Customer\Ui\Component\DataProvider\Document::getCustomAttribute
      */

diff --git a/app/code/Magento/Customer/Ui/Component/DataProvider/Document.php b/app/code/Magento/Customer/Ui/Component/DataProvider/Document.php
@@ -89,7 +89,7 @@ public function __construct(
         $this->customerMetadata = $customerMetadata;
         $this->groupRepository = $groupRepository;
         $this->storeManager = $storeManager;
-        $this->scopeConfig = $scopeConfig ? $scopeConfig : ObjectManager::getInstance()->create(ScopeConfigInterface::class);
+        $this->scopeConfig = $scopeConfig ?: ObjectManager::getInstance()->create(ScopeConfigInterface::class);
     }
 
     /**
@@ -181,7 +181,8 @@ private function setConfirmationValue()
         $isConfirmationRequired = (bool)$this->scopeConfig->getValue(
             AccountManagement::XML_PATH_IS_CONFIRM,
             ScopeInterface::SCOPE_WEBSITES,
-            $websiteId);
+            $websiteId
+        );
 
         $valueText = __('Confirmation Not Required');
         if ($isConfirmationRequired) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -188,7 +188,6 @@ public function testGetConfirmationAttribute() @@
             static::assertEquals('Confirmed', (string)$value);
         }
         /**
          * @covers \Magento\Customer\Ui\Component\DataProvider\Document::getCustomAttribute
          */
@@ Expand Down @@