Resolve merge conflict in manifest

nebras-solutions · Mar 14, 2019 · 813e9fd · 813e9fd
1 parent 3066593
commit 813e9fd
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/auth_totp/__manifest__.py b/auth_totp/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'MFA Support',
     'summary': 'Allows users to enable MFA and add optional trusted devices',
-    'version': '11.0.1.0.0',
+    'version': '11.0.1.1.0',
     'category': 'Tools',
     'website': 'https://github.com/OCA/server-auth',
     'author': 'LasLabs, Odoo Community Association (OCA)',

diff --git a/auth_totp/wizards/res_users_authenticator_create.py b/auth_totp/wizards/res_users_authenticator_create.py
@@ -27,6 +27,7 @@ class ResUsersAuthenticatorCreate(models.TransientModel):
         required=True,
     )
     secret_key = fields.Char(
+        string='Secret Code',
         default=lambda s: pyotp.random_base32(),
         required=True,
     )

diff --git a/auth_totp/wizards/res_users_authenticator_create.xml b/auth_totp/wizards/res_users_authenticator_create.xml
@@ -15,14 +15,14 @@
                 <sheet>
                     <div>
                         <span>Please provide a name for your app/device. </span>
-                        <span>Then scan the QR code below to add this account to your authenticator app and enter in the six digit code produced by the app.</span>
+                        <span>Then scan the QR code or enter the secret code below to add this account to your authenticator app and enter in the six digit code produced by the app.</span>
                     </div>
                     <group name="data">
                         <field name="name"/>
                         <field name="user_id"/>
+                        <field name="secret_key" readonly="1"/>
                         <field name="qr_code_tag"/>
                         <field name="confirmation_code"/>
-                        <field name="secret_key" invisible="1"/>
                     </group>
                 </sheet>
                 <footer>