Merge pull request #2988 from freenas/NAS-101592

NAS-101592 / 11.3 / Bug fixes for legacy wizards
truenas · May 3, 2019 · f439640 · f439640
2 parents fdf1d31 + 08c6431
commit f439640
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/gui/system/forms.py b/gui/system/forms.py
@@ -699,6 +699,7 @@ def done(self, form_list, **kwargs):
                 'stg_kbdmap': cleaned_data.get('stg_kbdmap'),
                 'stg_timezone': cleaned_data.get('stg_timezone'),
             })
+            settingsdata['stg_guicertificate'] = settingsdata.pop('stg_guicertificate_id')
             settingsform = SettingsForm(
                 data=settingsdata,
                 instance=settingsm,
@@ -707,7 +708,7 @@ def done(self, form_list, **kwargs):
                 settingsform.save()
             else:
                 log.warn(
-                    'Active Directory data failed to validate: %r',
+                    'Settings form failed to validate: %r',
                     settingsform._errors,
                 )
         except Exception:
@@ -742,6 +743,10 @@ def done(self, form_list, **kwargs):
                     'ad_bindpw': cleaned_data.get('ds_ad_bindpw'),
                     'ad_enable': True,
                 })
+                with client as c:
+                    ad_config = c.call('activedirectory.config')
+                    addata['ad_netbiosname'] = ad_config['netbiosname']
+
                 adform = ActiveDirectoryForm(
                     data=addata,
                     instance=ad,