add config for auth
authorAntony Lesuisse <al@openerp.com>
Thu, 16 Aug 2012 12:24:21 +0000 (14:24 +0200)
committerAntony Lesuisse <al@openerp.com>
Thu, 16 Aug 2012 12:24:21 +0000 (14:24 +0200)
bzr revid: al@openerp.com-20120816122421-tt79y5bdfdg1fth8

addons/auth_signup/res_config.xml
addons/base_setup/res_config_view.xml
addons/mail/res_config_view.xml

index 3bea8dc..43b0c09 100644 (file)
@@ -7,16 +7,11 @@
             <field name="model">base.config.settings</field>
             <field name="inherit_id" ref="base_setup.view_general_configuration"/>
             <field name="arch" type="xml">
-                <xpath expr="//group[last()]" position="after">
-                    <group>
-                        <label for="id" string="External Users"/>
-                        <div>
-                            <div>
-                                <label for="auth_signup_template_user_id"/>
-                                <field name="auth_signup_template_user_id" class="oe_inline"/>
-                            </div>
-                        </div>
-                    </group>
+                <xpath expr="//field[@name='module_auth_signup']/.." position="after">
+                    <div attrs="{'invisible':[('module_auth_signup','=',False)]}">
+                        <label for="auth_signup_template_user_id"/>
+                        <field name="auth_signup_template_user_id" class="oe_inline"/>
+                    </div>
                 </xpath>
             </field>
         </record>
index fd1bd10..5e49f6d 100644 (file)
@@ -27,9 +27,9 @@
                             </div>
                         </div>
                     </group>
-                    <group>
+                    <group name="email">
                         <label for="id" string="Email"/>
-                        <div>
+                        <div name="email">
                             <div>
                                 <button type="action"
                                     name="%(base.action_ir_mail_server_list)d"
@@ -57,6 +57,7 @@
                                 <field name="module_auth_signup" class="oe_inline"/>
                                 <label for="module_auth_signup"/>
                             </div>
+                            ->
                             <div>
                                 <field name="module_auth_oauth" class="oe_inline"/>
                                 <label for="module_auth_oauth"/>
index c4bc23c..99c19c8 100644 (file)
@@ -6,7 +6,7 @@
             <field name="model">base.config.settings</field>
             <field name="inherit_id" ref="base_setup.view_general_configuration"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/group[last()]/div[last()]/div[last()]" position='after' version="7.0">
+                <xpath expr="//div[@name='email']" position='inside' version="7.0">
                     <div>
                         <label for="alias_domain" class="oe_inline"/><field name="alias_domain" placeholder="mycompany.my.openerp.com" class="oe_inline"/>
                     </div>