From 4d9fa191228a9aa917106899f7fbc2fcf99b53a8 Mon Sep 17 00:00:00 2001 From: "Pinakin Nayi (OpenERP)" Date: Mon, 24 Sep 2012 10:47:24 +0530 Subject: [PATCH] [IMP]sign in or sign out button enable if attendance group bzr revid: pna@tinyerp.com-20120924051724-m5b74g2kfw8c337h --- addons/hr_attendance/hr_attendance.py | 11 ++++++----- addons/hr_attendance/static/src/js/attendance.js | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/addons/hr_attendance/hr_attendance.py b/addons/hr_attendance/hr_attendance.py index 3a704e8f466..626fd45ba42 100644 --- a/addons/hr_attendance/hr_attendance.py +++ b/addons/hr_attendance/hr_attendance.py @@ -129,11 +129,12 @@ class hr_employee(osv.osv): def _attendance_access(self, cr, uid, ids, name, args, context=None): res = {} data_obj = self.pool.get('ir.model.data') - group = data_obj.get_object(cr, uid,'hr_attendance', 'hr_attendace_group') - if uid in [user.id for user in group.user]: - res[ids] = True - else: - res[ids] = False + group = data_obj.get_object(cr, uid, 'base', 'group_hr_attendance') + for id in ids : + if uid in [user.id for user in group.users]: + res[id] = True + else: + res[id] = False return res _columns = { diff --git a/addons/hr_attendance/static/src/js/attendance.js b/addons/hr_attendance/static/src/js/attendance.js index 0068b495628..d92e7534786 100644 --- a/addons/hr_attendance/static/src/js/attendance.js +++ b/addons/hr_attendance/static/src/js/attendance.js @@ -60,7 +60,7 @@ openerp.hr_attendance = function (instance) { return employee.read_slice(['id', 'name', 'state', 'last_sign', 'attendance_access']).pipe(function (res) { if (_.isEmpty(res) ) return; - if (res['attendance_access'] == false){ + if (res[0].attendance_access == false){ return; } self.$el.show();