Devishree Brahmbhatt (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-bug-785673-dbr into
lp:openobject-addons.
Requested reviews:
Bhumika (OpenERP) (sbh-openerp)
Related bugs:
Bug #785673 in OpenERP Addons: "[PS] crm_caldav - wrong url when
synchronizing a meeting calendar"
https://bugs.launchpad.net/openobject-addons/+bug/785673
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-785673-dbr/+merge/65150
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-785673-dbr/+merge/65150
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-bug-785673-dbr.
=== modified file 'caldav/wizard/caldav_browse.py'
--- caldav/wizard/caldav_browse.py 2011-01-17 22:03:45 +0000
+++ caldav/wizard/caldav_browse.py 2011-06-20 05:18:29 +0000
@@ -197,8 +197,9 @@
host = config.get('xmlrpc_interface', None)
port = config.get('xmlrpc_port',8069)
if host == '' or None:
- host = 'localhost'
- port = 8069
+ obj = self.pool.get('user.preference').browse(cr,uid,uid,context)
+ host = obj.host_name
+ port = 8069
if not config.get_misc('webdav','enable',True):
raise Exception("WebDAV is disabled, cannot continue")
user_pool = self.pool.get('res.users')
@@ -238,6 +239,7 @@
'calendar' :fields.many2one('basic.calendar', 'Calendar', required=True),
'service': fields.selection([('webdav','CalDAV')], "Services"),
'device' : fields.selection([('other', 'Other'), ('iphone', 'iPhone'), ('android', 'Android based device'),('thunderbird', 'Sunbird/Thunderbird'), ('evolution','Evolution')], "Software/Devices"),
+ 'host_name': fields.char('Host Name', size=64, required=True),
}
def _get_default_calendar(self, cr, uid, context):
@@ -278,6 +280,22 @@
'target': 'new',
'context': context,
}
-
+
+ def next_window(self, cr, uid, ids, context=None):
+ obj_model = self.pool.get('ir.model.data')
+ model_data_ids = obj_model.search(cr,uid,[('model','=','ir.ui.view'),('name','=','user_prefernce_form')])
+ resource_id = obj_model.read(cr, uid, model_data_ids, fields=['res_id'])
+ context.update({'res_id': ids})
+ resource_id = obj_model.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
+
+ return {
+ 'view_type': 'form',
+ 'view_mode': 'form',
+ 'res_model': 'user.preference',
+ 'views': [(resource_id,'form')],
+ 'type': 'ir.actions.act_window',
+ 'target': 'new',
+ 'context': context,
+ }
user_preference()
=== modified file 'caldav/wizard/caldav_browse_view.xml'
--- caldav/wizard/caldav_browse_view.xml 2011-04-14 07:28:30 +0000
+++ caldav/wizard/caldav_browse_view.xml 2011-06-20 05:18:29 +0000
@@ -24,6 +24,28 @@
</field>
</record>
+ <record id="host_prefernce_form" model="ir.ui.view">
+ <field name="name">host_preference</field>
+ <field name="model">user.preference</field>
+ <field name="type">form</field>
+ <field name="arch" type="xml">
+ <form string="Host name configuration for caldev synchronization">
+ <separator string="Hostname example : " colspan="4"/>
+ <newline/>
+ <label string="database.my.openerp.com" colspan="4"/>
+ <newline/>
+ <label string=" or companyserver.com" colspan="4"/>
+ <newline/>
+ <field name="host_name" colspan="4" width="250" />
+ <separator colspan="4"/>
+ <group col="4" colspan="4">
+ <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
+ <button name="next_window" string="Next" type="object" icon="gtk-go-forward"/>
+ </group>
+ </form>
+ </field>
+ </record>
+
<record id="user_prefernce_form" model="ir.ui.view">
<field name="name">user_preference</field>
<field name="model">user.preference</field>
=== modified file 'crm_caldav/crm_caldav_view.xml'
--- crm_caldav/crm_caldav_view.xml 2011-04-20 06:51:19 +0000
+++ crm_caldav/crm_caldav_view.xml 2011-06-20 05:18:29 +0000
@@ -5,7 +5,7 @@
<field name="name">Caldav Browse</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">user.preference</field>
- <field name="view_id" ref="caldav.user_prefernce_form"/>
+ <field name="view_id" ref="caldav.host_prefernce_form"/>
<field name="context">{'cal_name' : 'Meetings'}</field>
<field name="view_type">form</field>
<field name="view_mode">form</field>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
