[FIX] user and group view fix

bzr revid: jam@tinyerp.com-20120704134303-977ap0upv0p8v230

diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index b024475..89a4b97 100644 (file)
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -69,8 +69,9 @@
                                 <field name="public" class="oe_inline"/>
                             </div>
                             <field name="description" colspan="4" nolabel="1"/>
-                            <div class="oe_edit_only">
-                                <field name="alias_id" required="0" domain="[('alias_model_id','=','mail.group')]" />
+                            <div>
+                                <label for="alias_name"/>
+                                <field name="alias_name"  class="oe_inline"/>@<field name="alias_domain" class="oe_inline"/>
                             </div>
                         </div>
                     </div>

diff --git a/addons/mail/res_users_view.xml b/addons/mail/res_users_view.xml
index 9af90ef..a93933a 100644 (file)
--- a/addons/mail/res_users_view.xml
+++ b/addons/mail/res_users_view.xml
@@ -32,7 +32,12 @@
                     </div>
                 </xpath>
                 <field name="active" position="after">
-                    <field name="alias_id" readonly="1" required="0"/>
+                    <group colspan="2">
+                        <div>
+                            <label for="alias_name"/>
+                            <field name="alias_name" readonly="1" class="oe_inline"/>@<field name="alias_domain" class="oe_inline"/>
+                        </div>
+                    </group>
                 </field>
             </data>
             </field>