FIX error while adding new user

magespecialist · Feb 19, 2018 · 50c9617 · 50c9617
1 parent 9aaa6a2
commit 50c9617
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 8 deletions.
diff --git a/Ui/Component/Form/User/DataProvider.php b/Ui/Component/Form/User/DataProvider.php
@@ -158,13 +158,29 @@ private function getTrustedDevices(User $user)
         return $res;
     }
 
+    /**
+     * @inheritdoc
+     */
+    public function getMeta()
+    {
+        $meta = parent::getMeta();
+
+        $meta['base_fieldset']['children']['msp_tfa_providers']['arguments']['data']['config']['forced_providers'] =
+            $this->getForcedProviders();
+        $meta['base_fieldset']['children']['msp_tfa_providers']['arguments']['data']['config']['enabled_providers'] =
+            $this->enabledProvider->toOptionArray();
+
+        return $meta;
+    }
+
+    /**
+     * @inheritdoc
+     */
     public function getData()
     {
         if ($this->loadedData === null) {
             $this->loadedData = [];
             $items = $this->collection->getItems();
-            $forcedProviders = $this->getForcedProviders();
-            $enabledProviders = $this->enabledProvider->toOptionArray();
 
             /** @var User $user */
             foreach ($items as $user) {
@@ -173,8 +189,6 @@ public function getData()
                 $trustedDevices = $this->getTrustedDevices($user);
 
                 $data = [
-                    'forced_providers' => $forcedProviders,
-                    'enabled_providers' => $enabledProviders,
                     'reset_providers' => $resetProviders,
                     'trusted_devices' => $trustedDevices,
                     'msp_tfa_providers' => $providerCodes,

diff --git a/view/adminhtml/ui_component/msp_twofactorauth_edit_user_form.xml b/view/adminhtml/ui_component/msp_twofactorauth_edit_user_form.xml
@@ -35,6 +35,7 @@
             <item name="namespace" xsi:type="string">msp_twofactorauth_edit_user_form</item>
         </item>
         <item name="template" xsi:type="string">templates/form/collapsible</item>
+        <item name="childrenFromMeta" xsi:type="boolean">true</item>
     </argument>
 
     <dataSource name="msp_twofactorauth_edit_user_form_data_source">

diff --git a/view/adminhtml/web/js/form/element/providers.js b/view/adminhtml/web/js/form/element/providers.js
@@ -24,15 +24,15 @@ define(['Magento_Ui/js/form/element/abstract'], function (Abstract) {
          * @returns {Array}
          */
         getForcedProviders: function () {
-            return this.source.data['forced_providers'];
+            return this.forced_providers;
         },
 
         /**
          * Get a list of enabled providers
          * @returns {Array}
          */
         getEnabledProviders: function () {
-            return this.source.data['enabled_providers'];
+            return this.enabled_providers;
         },
 
         /**

diff --git a/view/adminhtml/web/js/form/element/reset_providers.js b/view/adminhtml/web/js/form/element/reset_providers.js
@@ -27,7 +27,7 @@ define([
          * @returns {Array}
          */
         getResetProviders: function () {
-            return this.source.data['reset_providers'];
+            return this.source.data['reset_providers'] ? this.source.data['reset_providers'] : [];
         },
 
         /**

diff --git a/view/adminhtml/web/js/form/element/trusted_devices.js b/view/adminhtml/web/js/form/element/trusted_devices.js
@@ -26,7 +26,7 @@ define([
          * @returns {Array}
          */
         getTrustedDevices: function () {
-            return this.source.data['trusted_devices'];
+            return this.source.data['trusted_devices'] ? this.source.data['trusted_devices'] : [];
         },
 
         /**