diff options
| author | Akash Bhavsar <abh@odoo.com> | 2016-12-01 17:13:47 +0530 |
|---|---|---|
| committer | Yannick Tivisse <yti@odoo.com> | 2017-01-03 17:07:02 +0100 |
| commit | 79fd51b2a59224e8fa189f01c53d778e06774c59 (patch) | |
| tree | fc9b220edc5368cfb70ff7fd457e51fb6b7fa158 /addons/auth_ldap/views | |
| parent | 80c46ee4fc273f59823821dcdc98bcc6b7fdeeaf (diff) | |
[IMP] base_setup: Improve the `General Settings` form view
Diffstat (limited to 'addons/auth_ldap/views')
| -rw-r--r-- | addons/auth_ldap/views/auth_ldap_config_settings_views.xml | 42 | ||||
| -rw-r--r-- | addons/auth_ldap/views/ldap_installer_views.xml | 15 |
2 files changed, 21 insertions, 36 deletions
diff --git a/addons/auth_ldap/views/auth_ldap_config_settings_views.xml b/addons/auth_ldap/views/auth_ldap_config_settings_views.xml index b4586c8945d..67d14215027 100644 --- a/addons/auth_ldap/views/auth_ldap_config_settings_views.xml +++ b/addons/auth_ldap/views/auth_ldap_config_settings_views.xml @@ -1,42 +1,16 @@ <?xml version="1.0" encoding="utf-8"?> <odoo> - <record id="view_general_configuration_form_inherit_auth_ldap" model="ir.ui.view"> + <record id="base_config_settings_view_form_inherit_auth_ldap" model="ir.ui.view"> <field name="name">base.config.settings.form.inherit.auth.ldap</field> <field name="model">base.config.settings</field> - <field name="inherit_id" ref="base_setup.view_general_configuration"/> + <field name="inherit_id" ref="base_setup.base_config_settings_view_form"/> <field name="arch" type="xml"> - <xpath expr="//group[@name='google_analytics']" position="after"> - <group string="LDAP Parameters"> - <label for="ldaps"/> - <div class="row"> - <div class="col-xs-6"> - <field name="ldaps"> - <form string="LDAP Configuration"> - <group col="4"> - <field name="ldap_server"/> - <field name="ldap_server_port"/> - <field name="ldap_binddn"/> - <field name="ldap_password" password="True"/> - <field name="ldap_base"/> - <field name="ldap_filter"/> - <field name="create_user"/> - <field name="user"/> - <newline/> - <field name="sequence"/> - <field name="ldap_tls"/> - </group> - </form> - <tree string="LDAP Configuration"> - <field name="sequence"/> - <field name="ldap_server"/> - <field name="ldap_server_port"/> - <field name="ldap_base"/> - </tree> - </field> - </div> - </div> - </group> - </xpath> + <div name='auth_ldap_right_pane' position="inside"> + <div> + <button type="action" name="%(auth_ldap.action_ldap_installer)d" string="LDAP Server" icon="fa-arrow-right" class="btn-link"/> + </div> + </div> + <div id="auth_ldap_warning" position="replace"/> </field> </record> </odoo> diff --git a/addons/auth_ldap/views/ldap_installer_views.xml b/addons/auth_ldap/views/ldap_installer_views.xml index 7cc5cc67549..9d8bc50ed0a 100644 --- a/addons/auth_ldap/views/ldap_installer_views.xml +++ b/addons/auth_ldap/views/ldap_installer_views.xml @@ -33,14 +33,25 @@ </field> </record> + <record id="res_company_ldap_view_tree" model="ir.ui.view"> + <field name="name">res.company.ldap.tree</field> + <field name="model">res.company.ldap</field> + <field name="arch" type="xml"> + <tree string="LDAP Configuration"> + <field name="company"/> + <field name="ldap_server"/> + <field name="ldap_server_port"/> + </tree> + </field> + </record> + <!-- ldap installer action --> <record id="action_ldap_installer" model="ir.actions.act_window"> <field name="name">Setup your LDAP Server</field> <field name="type">ir.actions.act_window</field> <field name="res_model">res.company.ldap</field> <field name="view_type">form</field> - <field name="view_mode">form</field> - <field name="view_id" ref="view_ldap_installer_form"/> + <field name="view_mode">tree,form</field> </record> </odoo> |