From 37a0b05a170d0fe454f27cfabe8689d0a08ae552 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Mon, 12 Apr 2010 17:15:51 +0530
Subject: [PATCH] [REF] caldav

bzr revid: hmo@tinyerp.com-20100412114551-pkrd135oxul8pw1u
---
 addons/caldav/__init__.py                     |  2 +-
 .../{caldav_collection.py => caldav.py}       | 16 ++++--
 addons/caldav/caldav_data.xml                 |  3 ++
 addons/caldav/caldav_view.xml                 | 54 +++++++++----------
 addons/crm_caldav/crm_caldav_data.xml         |  3 +-
 addons/document_webdav/webdav.py              |  1 +
 addons/project_caldav/project_caldav_data.xml |  5 +-
 7 files changed, 46 insertions(+), 38 deletions(-)
 rename addons/caldav/{caldav_collection.py => caldav.py} (98%)

diff --git a/addons/caldav/__init__.py b/addons/caldav/__init__.py
index 85e6b10a270..4a870385a68 100644
--- a/addons/caldav/__init__.py
+++ b/addons/caldav/__init__.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-import caldav_collection
+import caldav
 import caldav_fs
 import wizard
 
diff --git a/addons/caldav/caldav_collection.py b/addons/caldav/caldav.py
similarity index 98%
rename from addons/caldav/caldav_collection.py
rename to addons/caldav/caldav.py
index a58b6249cec..fb4eb35ca8d 100644
--- a/addons/caldav/caldav_collection.py
+++ b/addons/caldav/caldav.py
@@ -410,9 +410,15 @@ class CalDAV(object):
             self.ical_reset('value')
         return res
 
+class calendar_collection(osv.osv):
+    _inherit = 'document.directory' 
+    _columns = {
+        'calendar_ids': fields.one2many('basic.calendar', 'collection_id', 'Calendars'),
+    }
+calendar_collection()
 
 class Calendar(CalDAV, osv.osv):
-    _inherit = 'document.directory'    
+    _name = 'basic.calendar'    
     _calname = 'calendar'
 
     __attribute__ = {
@@ -430,11 +436,13 @@ class Calendar(CalDAV, osv.osv):
     }
     _columns = {
             'name': fields.char("Name", size=64),
+            'collection_id': fields.many2one('document.directory', 'Collection', \
+                                       required=True),
+            'user_id': fields.many2one('res.users', 'Owner'),
             'line_ids': fields.one2many('basic.calendar.lines', 'calendar_id', 'Calendar Lines'),            
             'create_date': fields.datetime('Created Date'),
             'write_date': fields.datetime('Modifided Date'),
-    }
-   
+    }   
 
     def export_cal(self, cr, uid, ids, vobj='vevent', context={}):
         """ Export Calendar
@@ -510,7 +518,7 @@ class basic_calendar_line(osv.osv):
                                     ('attendee', 'Attendee')], \
                                     string="Type", size=64),
             'object_id': fields.many2one('ir.model', 'Object'),
-            'calendar_id': fields.many2one('document.directory', 'Calendar', \
+            'calendar_id': fields.many2one('basic.calendar', 'Calendar', \
                                        required=True, ondelete='cascade'),
             'domain': fields.char('Domain', size=124),
             'mapping_ids': fields.one2many('basic.calendar.fields', 'type_id', 'Fields Mapping')
diff --git a/addons/caldav/caldav_data.xml b/addons/caldav/caldav_data.xml
index 7ebab73aca5..cd8b5918a40 100644
--- a/addons/caldav/caldav_data.xml
+++ b/addons/caldav/caldav_data.xml
@@ -2,6 +2,9 @@
 <openerp>
 	<data noupdate="1">
 		
+        <record model="document.directory" id="document.dir_calendars">
+            <field name="name">Calendars</field>
+        </record>
 
 		<!--		Event attributes-->
 
diff --git a/addons/caldav/caldav_view.xml b/addons/caldav/caldav_view.xml
index 696b1833513..794308daa99 100644
--- a/addons/caldav/caldav_view.xml
+++ b/addons/caldav/caldav_view.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
 	<data>
-        <record model="ir.ui.view" id="view_document_directory_caldav_form">
-            <field name="name">CalDAV Collections : Form</field>
-            <field name="model">document.directory</field>
+        <record model="ir.ui.view" id="view_caldav_form">
+            <field name="name">Calendar : Form</field>
+            <field name="model">basic.calendar</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="CalDAV Collections">
-                    <field name="name"/>
+                <form string="Calendar">
+                    <field name="name" colspan="4"/>
                     <field name="user_id"/>
-                    <separator string="Calendar" colspan="4"/>
+                    <field name="collection_id" required="1"/>                                        
                     <field name="line_ids" mode="form,tree" colspan="4" nolabel="1">
 					    <form string="Calendar Lines">
 					        <field name="name" required="1" select="1" />
@@ -43,13 +43,12 @@
     </record>
 
 
-    <record model="ir.ui.view" id="view_document_directory_caldav_tree">
-        <field name="name">CalDAV Collections : Tree</field>
-        <field name="model">document.directory</field>
-        <field name="type">tree</field>
-        <field name="field_parent">child_ids</field>
+    <record model="ir.ui.view" id="view_caldav_tree">
+        <field name="name">Calendar : Tree</field>
+        <field name="model">basic.calendar</field>
+        <field name="type">tree</field>        
         <field name="arch" type="xml">
-            <tree string="Collections" toolbar="1">
+            <tree string="Calendars" toolbar="1">
                 <field name="name"/>                
                 <field name="user_id"/>
                 <field name="create_date"/>
@@ -58,35 +57,30 @@
         </field>
     </record>
 
-    <record model="ir.actions.act_window" id="action_document_directory_caldav_form">
-        <field name="name">CalDAV Collections</field>
+    <record model="ir.actions.act_window" id="action_caldav_form">
+        <field name="name">Calendars</field>
         <field name="type">ir.actions.act_window</field>
-        <field name="res_model">document.directory</field>
+        <field name="res_model">basic.calendar</field>
         <field name="view_type">form</field>
-        <field name="view_mode">tree,form</field>
-        <field name="domain">[('line_ids','!=', False)]</field>
-    </record>
+        <field name="view_mode">tree,form</field>        
+    </record>    
 
-    <record model="ir.actions.act_window" id="document.action_document_directory_form">
-         <field name="domain">[('line_ids','=', False)]</field>
-    </record>
-
-    <record id="action_dir_caldav_view1" model="ir.actions.act_window.view">
+    <record id="action_caldav_view1" model="ir.actions.act_window.view">
         <field eval="10" name="sequence"/>
         <field name="view_mode">tree</field>
-        <field name="view_id" ref="view_document_directory_caldav_tree"/>
-        <field name="act_window_id" ref="action_document_directory_caldav_form"/>
+        <field name="view_id" ref="view_caldav_tree"/>
+        <field name="act_window_id" ref="action_caldav_form"/>
     </record>
-    <record id="action_dir_caldav_view2" model="ir.actions.act_window.view">
+    <record id="action_caldav_view2" model="ir.actions.act_window.view">
         <field eval="20" name="sequence"/>
         <field name="view_mode">form</field>
-        <field name="view_id" ref="view_document_directory_caldav_form"/>
-        <field name="act_window_id" ref="action_document_directory_caldav_form"/>
+        <field name="view_id" ref="view_caldav_form"/>
+        <field name="act_window_id" ref="action_caldav_form"/>
     </record>
 
     <menuitem
-        action="action_document_directory_caldav_form"
-        id="menu_document_caldav_directories"
+        action="action_caldav_form"
+        id="menu_caldav_directories"
         parent="document.menu_document_management_configuration"/>
 	</data>
 </openerp>
diff --git a/addons/crm_caldav/crm_caldav_data.xml b/addons/crm_caldav/crm_caldav_data.xml
index ccaea831cf9..ca5f38f65b8 100644
--- a/addons/crm_caldav/crm_caldav_data.xml
+++ b/addons/crm_caldav/crm_caldav_data.xml
@@ -4,8 +4,9 @@
 
 <!--		Event Attribute mapping for Calendar-->
 
-        <record model="document.directory" id="caldav.basic_calendar1">
+        <record model="basic.calendar" id="caldav.basic_calendar1">
 			<field name="name">Meetings</field>
+            <field name="collection_id" ref="document.dir_calendars"></field>
 		</record>
 
         <record model="basic.calendar.lines" id="base_calendar.calendar_lines_event">
diff --git a/addons/document_webdav/webdav.py b/addons/document_webdav/webdav.py
index 6e816c35e10..b69c21d62ee 100644
--- a/addons/document_webdav/webdav.py
+++ b/addons/document_webdav/webdav.py
@@ -25,6 +25,7 @@ import urlparse
 import urllib
 from DAV import utils
 from DAV.propfind import PROPFIND
+import tools
 
 
 super_mk_prop_response = PROPFIND.mk_prop_response
diff --git a/addons/project_caldav/project_caldav_data.xml b/addons/project_caldav/project_caldav_data.xml
index 5970100800d..59c9e5bd9f7 100644
--- a/addons/project_caldav/project_caldav_data.xml
+++ b/addons/project_caldav/project_caldav_data.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0"?>
 <openerp>
-	<data noupdate="1">
+	<data noupdate="1">       
 
-        <record model="document.directory" id="caldav.basic_calendar2">
+        <record model="basic.calendar" id="caldav.basic_calendar2">
 			<field name="name">Todo</field>
+            <field name="collection_id" ref="document.dir_calendars"></field>
 		</record>
 		
         <record model="basic.calendar.lines" id="caldav.calendar_lines_todo">