From afe3ea9e46c6ba85b9e03d1452b7e7dcaf64fea0 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Mon, 26 Mar 2012 16:52:21 +0530
Subject: [PATCH 1/3] [IMP]

bzr revid: apa@tinyerp.com-20120326112221-jupd2mmjc504iu2x
---
 addons/event/event.py | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index 6cd42843194..b9ca4d3276f 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -223,20 +223,14 @@ class event_event(osv.osv):
                                                          'name':user.name,
                                                          'user_id':uid,
                                                          'subscribe':True})
-        else:
-            register_pool.write(cr, uid, curr_reg_id,{'subscribe':True})
         if isinstance(curr_reg_id, (int, long)):curr_reg_id = [curr_reg_id]
-        register_pool.confirm_registration(cr,uid,curr_reg_id,context)
-        return True
+        return register_pool.confirm_registration(cr,uid,curr_reg_id,context)
     
     def unsubscribe_to_event(self,cr,uid,ids,context=None):
         register_pool = self.pool.get('event.registration')
         curr_reg_id = register_pool.search(cr,uid,[('user_id','=',uid),('event_id','=',ids[0])])
-        if curr_reg_id:
-            if isinstance(curr_reg_id, (int, long)):curr_reg_id = [curr_reg_id]
-            register_pool.write(cr, uid, curr_reg_id,{'subscribe':False})
-            register_pool.button_reg_cancel(cr,uid,curr_reg_id,context)
-        return True
+        if isinstance(curr_reg_id, (int, long)):curr_reg_id = [curr_reg_id]
+        return register_pool.button_reg_cancel(cr,uid,curr_reg_id,context)
 
     def _check_closing_date(self, cr, uid, ids, context=None):
         for event in self.browse(cr, uid, ids, context=context):
@@ -304,7 +298,7 @@ class event_registration(osv.osv):
 
     def confirm_registration(self, cr, uid, ids, context=None):
         self.message_append(cr, uid, ids,_('State set to open'),body_text= _('Open'))
-        return self.write(cr, uid, ids, {'state': 'open'}, context=context)
+        return self.write(cr, uid, ids, {'state': 'open','subscribe':True}, context=context)
 
 
     def registration_open(self, cr, uid, ids, context=None):
@@ -331,7 +325,7 @@ class event_registration(osv.osv):
 
     def button_reg_cancel(self, cr, uid, ids, context=None, *args):
         self.message_append(cr, uid, ids,_('State set to Cancel'),body_text= _('Cancel'))
-        return self.write(cr, uid, ids, {'state': 'cancel'})
+        return self.write(cr, uid, ids, {'state': 'cancel','subscribe':False})
 
     def mail_user(self, cr, uid, ids, context=None):
         """

From ea7cedc96d857d6e842427d770f734e492de1e9d Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Mon, 26 Mar 2012 17:01:32 +0530
Subject: [PATCH 2/3] [IMP]

bzr revid: apa@tinyerp.com-20120326113132-bnodi8lyzwohf5v3
---
 addons/event/event.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index b9ca4d3276f..a69e17aa269 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -215,14 +215,13 @@ class event_event(osv.osv):
     def subscribe_to_event(self,cr,uid,ids,context=None):
         register_pool = self.pool.get('event.registration')
         user_pool = self.pool.get('res.users')
-        curr_reg_id = register_pool.search(cr,uid,[('user_id','=',uid),('event_id','=',ids[0])])
         user = user_pool.browse(cr,uid,uid,context)
+        curr_reg_id = register_pool.search(cr,uid,[('user_id','=',user.id),('event_id','=',ids[0])])
         if not curr_reg_id:
-            curr_reg_id = register_pool.create(cr, uid, {'event_id':ids[0],
-                                                         'email':user.user_email,
-                                                         'name':user.name,
-                                                         'user_id':uid,
-                                                         'subscribe':True})
+            curr_reg_id = register_pool.create(cr, uid, {'event_id':ids[0],'email':user.user_email,
+                                                         'name':user.name,'user_id':user.id,
+                                                         'subscribe':True
+                                                         })
         if isinstance(curr_reg_id, (int, long)):curr_reg_id = [curr_reg_id]
         return register_pool.confirm_registration(cr,uid,curr_reg_id,context)
     

From b79985289aaa717c2c7b886ffdf0f70150e01adf Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Mon, 26 Mar 2012 17:08:47 +0530
Subject: [PATCH 3/3] [IMP]

bzr revid: apa@tinyerp.com-20120326113847-rcw09e4bp87sn6fh
---
 addons/event/event.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index a69e17aa269..8aca855cc0a 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -287,7 +287,6 @@ class event_registration(osv.osv):
     _defaults = {
         'nb_register': 1,
         'state': 'draft',
-        #'user_id': lambda self, cr, uid, ctx: uid,
     }
     _order = 'name, create_date desc'