[IMP]: audittrail: Usability improvement in audittrail module.

bzr revid: atp@tinyerp.co.in-20100506121430-w269vskl2ucsu5k6

2 files changed, 73 insertions, 15 deletions

diff --git a/addons/audittrail/audittrail.py b/addons/audittrail/audittrail.py
index 80166298edb..16041889575 100644
--- a/addons/audittrail/audittrail.py
+++ b/addons/audittrail/audittrail.py
@@ -36,7 +36,7 @@ class audittrail_rule(osv.osv):
         "name": fields.char("Rule Name", size=32, required=True), 
         "object_id": fields.many2one('ir.model', 'Object', required=True), 
         "user_id": fields.many2many('res.users', 'audittail_rules_users', 
-                                            'user_id', 'rule_id', 'Users'), 
+                                            'user_id', 'rule_id', 'Users', help="if  User is not added then it will applicable for all users"), 
         "log_read": fields.boolean("Log reads"), 
         "log_write": fields.boolean("Log writes"), 
         "log_unlink": fields.boolean("Log deletes"), 
diff --git a/addons/audittrail/audittrail_view.xml b/addons/audittrail/audittrail_view.xml
index a79e6a0b6c0..b0efa7c29f2 100644
--- a/addons/audittrail/audittrail_view.xml
+++ b/addons/audittrail/audittrail_view.xml
@@ -16,8 +16,9 @@
                     <field name="log_write" />
                     <field name="log_unlink" />
                     <field name="log_create" />
-                    <field name="action_id" colspan="4" readonly="1"/>
-                    <field name="user_id" select="1" colspan="4"/>
+                    <separator string="Users (if User is not added then it will applicable for all users)"  colspan="4" />
+                    <field name="user_id" select="1" colspan="4" nolabel="1" />
+                    <field name="action_id" colspan="4" readonly="1" groups="base.group_extended"/>
                     <field name="state" select="1" readonly="1" />
                     <group colspan="2" col="2">
                         <button string="Subscribe" name="subscribe"
@@ -37,7 +38,7 @@
                 <tree string="AuditTrail Rules">
                     <field name="name" />
                     <field name="object_id"/>
-                    <field name="user_id" />
+                    <field name="user_id"/>
                     <field name="log_read" />
                     <field name="log_write" />
                     <field name="log_unlink" />
@@ -46,7 +47,38 @@
                 </tree>
             </field>
         </record>
-
+        
+        <!-- Audittrail rule  Search View -->
+
+	    <record id="view_audittrail_rule_filter" model="ir.ui.view">
+	        <field name="name">Audittrail-rule Search</field>
+	        <field name="model">audittrail.rule</field>
+	        <field name="type">search</field>
+	        <field name="arch" type="xml">
+	            <search string="Search rule">
+	            	<group>
+		                <filter icon="terp-project"
+		                    string="Draft"
+		                    domain="[('state','=','draft')]"/>
+		                <filter icon="terp-project"
+		                    name="subscribed"
+		                    string="Subscribed"
+		                    domain="[('state','=','subscribed')]"/>
+		                <separator orientation="vertical"/>
+		                <field name="name"/>
+		                <field name="object_id" widget="selection"/>
+		                <field name="user_id" widget="selection"/>
+		            </group>    
+	                <newline/>
+	                <group expand="1" string="Group By..." colspan="14">
+	                    <filter string="State" icon="terp-crm" domain="[]" context="{'group_by':'state'}"/>
+	                    <filter string="Object" icon="terp-crm" domain="[]" context="{'group_by':'object_id'}"/>
+	                </group>
+ 					<newline/>	                
+	            </search>
+	        </field>
+	    </record>
+	    
     <!-- Action for audittrail rule -->
 
         <record model="ir.actions.act_window" id="action_audittrail_rule_tree">
@@ -55,7 +87,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <!--<field name="view_id" ref="view_audittrail_rule_form" />-->
+           <field name="search_view_id" ref="view_audittrail_rule_filter"/>
         </record>
 
         <menuitem name="Audittrails" id="menu_action_audittrail"
@@ -89,14 +121,16 @@
                     <field name="res_id" readonly="1"/>
                     <field name="name" readonly="1" select="1"/>
                     <field name="line_ids" colspan="4" mode="tree,form"
-                        widget="one2many_list" readonly="1">
+                        widget="one2many_list" readonly="1" nolabel="1">
                         <form string="Log Lines">
-                            <field name="field_id" colspan="4"
-                                readonly="1" />
+                            <group colspan="4" col="2">       
+                            <field name="field_id" 
+                                readonly="1" colspan="4"/>
                             <newline />
-                            <field name="field_description" colspan="4"
-                                readonly="1" />
+                            <field name="field_description" 
+                                readonly="1" colspan="4"/>
                             <newline />
+                            </group>
                             <separator string="Old Value : "
                                 colspan="2" />
                             <separator string="New Value : "
@@ -142,6 +176,31 @@
                 </tree>
             </field>
         </record>
+        
+        <record id="view_audittrail_log_filter" model="ir.ui.view">
+	        <field name="name">Audittrail-log Search</field>
+	        <field name="model">audittrail.log</field>
+	        <field name="type">search</field>
+	        <field name="arch" type="xml">
+	            <search string="Search log">
+	            	<group>
+                    <field name="timestamp" />
+                    <field name="name" />
+                    <field name="object_id" widget="selection"/>
+                    <field name="method" />
+                    <field name="user_id" widget="selection"/>
+		            </group>    
+	                <newline/>
+	                 <group expand="1" string="Group By..." colspan="14">
+	              		<filter string="Log Date" icon="terp-crm" domain="[]" context="{'group_by':'timestamp'}"/>
+	              		<filter string="Log Method" icon="terp-crm" domain="[]" context="{'group_by':'method'}"/>	   
+	                    <filter string="Object" icon="terp-crm" domain="[]" context="{'group_by':'object_id'}"/>
+	                    <filter string="User" icon="terp-partner" name="user" domain="[]" context="{'group_by':'user_id'}"/>
+	                </group>
+ 					<newline/>	                
+	            </search>
+	        </field>
+	    </record>
 
 <!--  Action for Audittrail Log  -->
 
@@ -149,13 +208,12 @@
             <field name="name">Logs</field>
             <field name="res_model">audittrail.log</field>
             <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="view_audittrail_log_filter"/>
         </record>
+        
         <menuitem name="Logs" id="menu_action_audittrail_log_tree"
             action="action_audittrail_log_tree" parent="menu_action_audittrail" />
 
-        <!--  <wizard string="View log" menu="False" model="audittrail.log" name="audittrail.view.log" id="wizard_audittrail_log"/>-->
-        <menuitem name="View Logs" id="menu_action_log_tree2"
-            action="action_audittrail_view_log" parent="menu_action_audittrail" />
-
     </data>
 </openerp>