[IMP]: base_calendar: Minor improvements

bzr revid: rpa@tinyerp.com-20100702091042-zgzsdboa1eazrn0y

diff --git a/addons/base_calendar/__openerp__.py b/addons/base_calendar/__openerp__.py
index 052e0f4..2d18f67 100644 (file)
--- a/addons/base_calendar/__openerp__.py
+++ b/addons/base_calendar/__openerp__.py
@@ -42,7 +42,7 @@
         'wizard/base_calendar_set_exrule_view.xml',
         'base_calendar_view.xml'
     ],
-   # "test" : ['test/base_calendar_test.yml'],
+    "test" : ['test/base_calendar_test.yml'],
     "installable" : True,
     "active" : False,
 }

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 10a7bcf..d7cbabc 100644 (file)
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -1544,7 +1544,7 @@ true, it will allow you to hide the event alarm information without removing it.
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
-        @param ids: List of calendar attendee’s IDs
+        @param ids: List of Event IDs
         @param *args: Get Tupple value
         @param context: A standard dictionary for contextual values 
         """
@@ -1555,7 +1555,7 @@ true, it will allow you to hide the event alarm information without removing it.
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
-        @param ids: List of calendar attendee’s IDs
+        @param ids: List of Event IDs
         @param *args: Get Tupple value
         @param context: A standard dictionary for contextual values 
         """
@@ -1566,7 +1566,7 @@ true, it will allow you to hide the event alarm information without removing it.
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
-        @param ids: List of calendar attendee’s IDs
+        @param ids: List of Event IDs
         @param *args: Get Tupple value
         @param context: A standard dictionary for contextual values 
         """

diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index a6789e5..7e23686 100644 (file)
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -378,6 +378,7 @@
                     <field name="show_as" />
                     <field name="class" string="Privacy" />
                     <field name="user_id" invisible="1"/>
+                    <field name="state" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -411,6 +412,10 @@
                                domain="[('user_id','=',uid)]"
                                help="My Events" />
                            <separator orientation="vertical"/>
+                           <filter icon="terp-check" string="Confirmed"
+                               domain="[('state','=','confirmed')]"
+                               help="Confirmed Events" />
+                           <separator orientation="vertical"/>
                            <field name="name" select="1" string="Summary"/>
                            <field name="location" select="1" string="Location"/>
                            <separator orientation="vertical"/>
@@ -421,6 +426,8 @@
                        </group>
                        <newline/>
                         <group expand="0" string="Group By...">
+                            <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]"
+                                context="{'group_by':'state'}" />
                             <filter string="Date" icon="terp-go-month"
                                 domain="[]" context="{'group_by':'date'}" />
                             <filter string="Availability" icon="terp-camera_test"

diff --git a/addons/base_calendar/security/ir.model.access.csv b/addons/base_calendar/security/ir.model.access.csv
index a334fd9..8638226 100644 (file)
--- a/addons/base_calendar/security/ir.model.access.csv
+++ b/addons/base_calendar/security/ir.model.access.csv
@@ -3,3 +3,4 @@
 "access_calendar_alarm","calendar.alarm","model_calendar_alarm","base.group_user",1,1,1,1
 "access_res_alarm","res.alarm","model_res_alarm","base.group_user",1,1,1,1
 "access_calendar_todo","calendar.todo","model_calendar_todo","base.group_user",1,1,1,1
+"access_calendar_event","calendar.event.user","model_calendar_event","base.group_user",1,1,1,1