[ADD, IMP] base: Added search views, Improved views of Administration-> Security.

[odoo/odoo.git] / bin / addons / base / ir / ir.xml

diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml
index 9010475..efc6fa8 100644 (file)
--- a/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@ -1494,28 +1494,43 @@
             <field name="arch" type="xml">
                 <form string="Menu">
                     <group col="8">
-                        <field name="name" select="1" string="Menu" />
-                        <field  name="parent_id" select="1" colspan="4"/>
+                        <field name="name" string="Menu" />
+                        <field  name="parent_id" colspan="4"/>
                         <field name="sequence" colspan="2"/>
                         <field name="complete_name" string="Full Path" colspan="8"/>
                         <field name="action" colspan="4" />
                         <field name="icon" on_change="onchange_icon(icon)" colspan="2"/>
                         <field name="icon_pict" widget="picture" nolabel="1" colspan="2"/>
                     </group>
-                    <group col="4" colspan="4" expand="1">
-                        <separator string="Security on Groups" colspan="4"/>
-                        <field name="groups_id"  colspan="4" nolabel="1"/>
-                    </group>
+                    <notebook colspan="4">
+                        <page string="Security on Groups">
+                                   <field name="groups_id" colspan="4" nolabel="1"/>
+                               </page>
+                           </notebook>
                 </form>
             </field>
         </record>
+        
+        <record id="edit_menu_access_search" model="ir.ui.view">
+            <field name="name">ir.ui.menu.search</field>
+            <field name="model">ir.ui.menu</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Menu">
+                       <field name="name" string="Menu" />
+                       <field name="parent_id"/>
+                   </search>
+               </field>
+           </record>
+                        
         <record id="grant_menu_access" model="ir.actions.act_window">
             <field name="name">Manage Menus</field>
             <field name="res_model">ir.ui.menu</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="edit_menu"/>
+            <field name="search_view_id" ref="edit_menu_access_search"/>
         </record>
-        <menuitem action="grant_menu_access" id="menu_grant_menu_access" parent="base.menu_security"/>
+        <menuitem action="grant_menu_access" id="menu_grant_menu_access" parent="base.menu_security" sequence="1"/>
 
         <!--
     =============================================================
@@ -1638,9 +1653,9 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Access Controls">
-                    <field colspan="4" name="name" select="1"/>
-                    <field name="model_id" select="1"/>
-                    <field name="group_id" select="1"/>
+                    <field colspan="4" name="name"/>
+                    <field name="model_id"/>
+                    <field name="group_id"/>
                     <newline/>
                     <field name="perm_read"/>
                     <field name="perm_write"/>
@@ -1649,13 +1664,27 @@
                 </form>
             </field>
         </record>
+        <record id="ir_access_view_search" model="ir.ui.view">
+            <field name="name">ir.model.access.search</field>
+            <field name="model">ir.model.access</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Access Controls">
+                    <field name="name"/>
+                    <field name="model_id"/>
+                    <field name="group_id"/>
+                </search>
+            </field>
+        </record>
+                    
         <record id="ir_access_act" model="ir.actions.act_window">
             <field name="name">Access Controls List</field>
             <field name="res_model">ir.model.access</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="ir_access_view_tree"/>
+            <field name="search_view_id" ref="ir_access_view_search"/>
         </record>
-        <menuitem name="Access Controls" id="menu_security_access" parent="menu_security"/>
+        <menuitem name="Access Controls" id="menu_security_access" parent="menu_security" sequence="5"/>
         <menuitem action="ir_access_act" id="menu_ir_access_act" parent="menu_security_access"/>
 
         <!-- Rules -->
@@ -1669,7 +1698,7 @@
                     <group col="2" colspan="2">
                         <separator colspan="2" string="General"/>
                         <field colspan="4" name="name"/>
-                        <field name="model_id" select="1"/>
+                        <field name="model_id"/>
                     </group>
                     <group col="4" colspan="2">
                         <separator colspan="4" string="Access Rights"/>
@@ -1684,8 +1713,8 @@
                     </group>
                     <separator colspan="4" string="Groups (no group = global)"/>
                     <group colspan="4" expand="1">
-                        <field name="global" select="1"/>
-                        <field name="groups" select="1" nolabel="1" colspan="4"/>
+                        <field name="global"/>
+                        <field name="groups" nolabel="1" colspan="4"/>
                     </group>
                     <separator colspan="4" string="Combination of rules"/>
                     <label align="0.0" colspan="4"
@@ -1716,14 +1745,27 @@
                 </tree>
             </field>
         </record>
+        <record id="view_rule_search" model="ir.ui.view">
+            <field name="name">Record rules</field>
+            <field name="model">ir.rule</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Record rules">
+                    <field name="model_id"/>
+                    <field name="global"/>
+                    <field name="groups"/>
+                </search>
+            </field>
+        </record>
 
         <record id="action_rule" model="ir.actions.act_window">
             <field name="name">Record Rules</field>
             <field name="res_model">ir.rule</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="view_rule_tree"/>
+            <field name="search_view_id" ref="view_rule_search"/>
         </record>
-        <menuitem action="action_rule" id="menu_action_rule" parent="base.menu_security"/>
+        <menuitem action="action_rule" id="menu_action_rule" parent="base.menu_security" sequence="3"/>
 
         <record id="property_rule" model="ir.rule">
             <field name="name">Property multi-company</field>