From 5c667f27f9bb4f791dba264886ecefd0e62d1047 Mon Sep 17 00:00:00 2001 From: "ajay javiya (OpenERP)" Date: Tue, 16 Jul 2013 15:20:15 +0530 Subject: [PATCH] [IMP]: Click on Direct in OpenERP should redirect to calender view of meeting bzr revid: aja@tinyerp.com-20130716095015-ls0xkmq7irn11z8c --- addons/base_calendar/static/src/js/base_calendar.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/addons/base_calendar/static/src/js/base_calendar.js b/addons/base_calendar/static/src/js/base_calendar.js index 2f2f9d5bcf1..b251b8d4df0 100644 --- a/addons/base_calendar/static/src/js/base_calendar.js +++ b/addons/base_calendar/static/src/js/base_calendar.js @@ -49,10 +49,16 @@ instance.base_calendar = {} var att_status = "do_decline"; var self = this; var reload_page = function(){ - return location.replace(_.str.sprintf('/?db=%s#id=%s&view_type=%s&model=crm.meeting',self.db,self.id,self.view_type)); + if(self.view_type === 'form'){ + return location.replace(_.str.sprintf('/?db=%s#id=%s&view_type=%s&model=crm.meeting',self.db,self.id,self.view_type)); + } + else{ + return location.replace(_.str.sprintf('/?db=%s#view_type=%s&model=crm.meeting&action=%s',self.db,self.view_type,self.action)); + } } if(self.status === 'accepted'){att_status = "do_accept";} var calender_attendee = new instance.web.Model('calendar.attendee') + return calender_attendee.get_func("search_read")([["id", "=", parseInt(this.token)]],['state']).done(function(res){ if(res[0] && res[0]['state'] === "needs-action"){ return calender_attendee.call(att_status,[[parseInt(self.token)]]).done(reload_page);