Improved search view by removing default values and shift it on actions

bzr revid: hda@tinyerp.com-20100407141220-enqywrvyecd2iaa3

1 files changed, 9 insertions, 6 deletions

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 62e1ecc3c62..25b2345dfb8 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -110,11 +110,11 @@
             <field name="arch" type="xml">
                 <search string="Search Project">
                    <group col='15' colspan='4'>
-                       <filter icon="terp-project" string="Current" domain="[('state', 'in',('open','draft'))]" help="Open and Draft Projects" default="1"/>
+                       <filter icon="terp-project" string="Current" domain="[('state', 'in',('open','draft'))]" help="Open and Draft Projects" name="open"/>
                        <filter icon="terp-project" string="Pending" domain="[('state', '=', 'pending')]" help="Pending Projects"/>
                        <separator orientation="vertical"/>
                        <filter icon="terp-project" string="Manager" domain="[('user_id', '=', uid)]" help="Projects in which I am a manager."/>
-                       <filter icon="terp-project" string="Member" domain="['|',('user_id', '=', uid),('members', '=', uid)]" help="Projects in which I am a member." default="1"/>
+                       <filter icon="terp-project" string="Member" domain="['|',('user_id', '=', uid),('members', '=', uid)]" help="Projects in which I am a member." name="member"/>
                        <separator orientation="vertical"/>
                        <filter icon="terp-project" string="Templates" domain="[('state','=','template')]" help="Template Projects"/>
                        <separator orientation="vertical"/>
@@ -152,6 +152,7 @@
             <field name="view_type">form</field>
             <field name="domain">[]</field>
             <field name="view_id" ref="view_project"/>
+            <field name="context">{"search_default_open":1,"search_default_member":1}</field>
             <field name="search_view_id" ref="view_project_project_filter"/>
         </record>
         <menuitem action="open_view_project_all" id="menu_open_view_project_all" parent="menu_project_management" sequence="1"/>
@@ -402,18 +403,18 @@
             <field name="arch" type="xml">
                <search string="Task Edition">
                     <group col="20" colspan="4">
-                        <filter string="Current" domain="[('state','in',('open','draft'))]" help="Draft, Open and Pending Tasks" icon="terp-project" default="1"/>
+                        <filter string="Current" domain="[('state','in',('open','draft'))]" help="Draft, Open and Pending Tasks" icon="terp-project" name="current"/>
                         <filter string="In Progress" domain="[('state','=','open')]" help="Open Tasks" icon="terp-project"/>
                         <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-project"/>
                         <separator orientation="vertical"/>
                         <filter string="Deadlines" domain="[('date_deadline','&lt;&gt;',False)]" help="Show only tasks having a deadline" icon="terp-project"/>
                         <separator orientation="vertical"/>
                         <field name="name" select="1"/>
-                        <field name="project_id" select="1" widget="selection" default="context.get('project_id', False)">
+                        <field name="project_id" select="1" widget="selection">
                              <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-project"/>
                         </field>
                         <field name="user_id" select="1" widget="selection">
-                            <filter domain="[('user_id','=',uid)]" help="My Tasks" icon="gtk-execute" default="1"/>
+                            <filter domain="[('user_id','=',uid)]" help="My Tasks" icon="gtk-execute" name="my_task"/>
                             <filter domain="[('user_id','=',False)]" help="Unassigned Tasks" icon="gtk-execute" separator="1"/>
                         </field>
                     </group>
@@ -439,6 +440,7 @@
             <field name="view_mode">tree,form,calendar,gantt,graph</field>
             <field eval="False" name="filter"/>
             <field name="view_id" ref="view_task_tree2"/>
+            <field name="context">{"search_default_current":1,"search_default_my_task":1,"search_default_project_id":project_id}</field>
             <field name="search_view_id" ref="view_task_search_form"/>
         </record>
         <menuitem action="action_view_task" id="menu_action_view_task" parent="project.menu_project_management" sequence="2"/>
@@ -605,7 +607,7 @@
 	                   <field name="subject"/>
 	                   <field name="project_id" select="1" widget="selection"/>
 	                   <field name="user_id" select="1" widget="selection">
-	                       <filter domain="[('user_id','=',uid)]" help="My Message" icon="gtk-execute" default="1"/>
+	                       <filter domain="[('user_id','=',uid)]" help="My Message" icon="gtk-execute" name="my_msg"/>
 	                   </field>
                    </group>
                    <newline/>
@@ -624,6 +626,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_project_message_tree"/>
+            <field name="context">{"search_default_my_msg":1}</field>        
             <field name="search_view_id" ref="view_project_message_search"/>
        </record>