mirror of
https://github.com/OCA/knowledge.git
synced 2025-07-25 01:48:41 -06:00
Fix pep8
This commit is contained in:
Sandy Carter
Gabriela Mogollon
parent
9c5f955d26
commit
62a4b39fba
@ -20,5 +20,3 @@
|
||||
##############################################################################
|
||||
|
||||
import document_page_approval
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@ -54,4 +54,3 @@ Scenario
|
||||
'auto_install': False,
|
||||
'images': ['images/category.png', 'images/page_history_list.png', 'images/page_history.png'],
|
||||
}
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@ -18,33 +18,39 @@
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
##############################################################################
|
||||
|
||||
from datetime import datetime
|
||||
from openerp.osv import fields, orm
|
||||
from datetime import *
|
||||
from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT
|
||||
|
||||
|
||||
class document_page_history_wkfl(orm.Model):
|
||||
_inherit = 'document.page.history'
|
||||
|
||||
def page_approval_draft(self, cr, uid, ids):
|
||||
def page_approval_draft(self, cr, uid, ids, context=None):
|
||||
self.write(cr, uid, ids, {'state': 'draft'})
|
||||
|
||||
template_id = self.pool.get('ir.model.data').get_object_reference(cr, uid,
|
||||
template_id = self.pool.get('ir.model.data').get_object_reference(
|
||||
cr, uid,
|
||||
'document_page_approval', 'email_template_new_draft_need_approval')[1]
|
||||
for page in self.browse(cr, uid, ids):
|
||||
for page in self.browse(cr, uid, ids, context=context):
|
||||
if page.is_parent_approval_required:
|
||||
self.pool.get('email.template').send_mail(cr, uid, template_id,
|
||||
page.id, force_send=True)
|
||||
self.pool.get('email.template').send_mail(
|
||||
cr, uid, template_id, page.id, force_send=True
|
||||
)
|
||||
|
||||
return True
|
||||
|
||||
def page_approval_approved(self, cr, uid, ids):
|
||||
self.write(cr, uid, ids, { 'state' : 'approved',
|
||||
'approved_date' : datetime.now().strftime('%Y-%m-%d %H:%M:%S'),
|
||||
def page_approval_approved(self, cr, uid, ids, context=None):
|
||||
self.write(cr, uid, ids, {
|
||||
'state': 'approved',
|
||||
'approved_date': datetime.now().strftime(DEFAULT_SERVER_DATETIME_FORMAT),
|
||||
'approved_uid': uid
|
||||
})
|
||||
}, context=context)
|
||||
return True
|
||||
|
||||
def can_user_approve_page(self, cr, uid, ids, name, args, context=None):
|
||||
user = self.pool.get('res.users').browse(cr,uid,uid)
|
||||
user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
|
||||
res = {}
|
||||
for page in self.browse(cr, uid, ids, context=context):
|
||||
res[page.id] = self.can_user_approve_this_page(page.page_id, user)
|
||||
@ -85,16 +91,16 @@ class document_page_history_wkfl(orm.Model):
|
||||
emails = ''
|
||||
guids = self.get_approvers_guids(cr, uid, ids, name, args, context=context)
|
||||
uids = self.pool.get('res.users').search(cr, uid, [('groups_id', 'in', guids[id])])
|
||||
users = self.pool.get('res.users').browse(cr, uid, uids)
|
||||
users = self.pool.get('res.users').browse(cr, uid, uids, context=context)
|
||||
|
||||
for user in users:
|
||||
if user.email:
|
||||
emails += user.email
|
||||
emails += ','
|
||||
else:
|
||||
empl_id = self.pool.get('hr.employee').search(cr, uid,
|
||||
[('login','=',user.login)])[0]
|
||||
empl = self.pool.get('hr.employee').browse(cr, uid, empl_id)
|
||||
empl_id = self.pool.get('hr.employee').search(
|
||||
cr, uid, [('login', '=', user.login)])[0]
|
||||
empl = self.pool.get('hr.employee').browse(cr, uid, empl_id, context=context)
|
||||
if empl.work_email:
|
||||
emails += empl.work_email
|
||||
emails += ','
|
||||
@ -106,10 +112,10 @@ class document_page_history_wkfl(orm.Model):
|
||||
def get_page_url(self, cr, uid, ids, name, args, context):
|
||||
res = {}
|
||||
for id in ids:
|
||||
base_url = self.pool.get('ir.config_parameter').get_param(cr, uid,
|
||||
'web.base.url', default='http://localhost:8069', context=context)
|
||||
base_url = self.pool.get('ir.config_parameter').get_param(
|
||||
cr, uid, 'web.base.url', default='http://localhost:8069', context=context)
|
||||
|
||||
res[id] = base_url + '/#db=%s&id=%s&view_type=form&model=document.page.history' % (cr.dbname, id);
|
||||
res[id] = base_url + '/#db=%s&id=%s&view_type=form&model=document.page.history' % (cr.dbname, id)
|
||||
|
||||
return res
|
||||
|
||||
@ -119,18 +125,20 @@ class document_page_history_wkfl(orm.Model):
|
||||
('approved', 'Approved')], 'Status', readonly=True),
|
||||
'approved_date': fields.datetime("Approved Date"),
|
||||
'approved_uid': fields.many2one('res.users', "Approved By"),
|
||||
'is_parent_approval_required': fields.related('page_id', 'is_parent_approval_required',
|
||||
'is_parent_approval_required': fields.related(
|
||||
'page_id', 'is_parent_approval_required',
|
||||
string="parent approval", type='boolean', store=False),
|
||||
'can_user_approve_page': fields.function(can_user_approve_page,
|
||||
string="can user approve this page", type='boolean', store=False),
|
||||
'get_approvers_email': fields.function(get_approvers_email,
|
||||
string="get all approvers email", type='text', store=False),
|
||||
'get_page_url': fields.function(get_page_url, string="URL", type='text',
|
||||
store=False),
|
||||
'can_user_approve_page': fields.function(
|
||||
can_user_approve_page, string="can user approve this page", type='boolean', store=False),
|
||||
'get_approvers_email': fields.function(
|
||||
get_approvers_email, string="get all approvers email", type='text', store=False),
|
||||
'get_page_url': fields.function(get_page_url, string="URL", type='text', store=False),
|
||||
}
|
||||
|
||||
|
||||
class document_page_approval(orm.Model):
|
||||
_inherit = 'document.page'
|
||||
|
||||
def _get_display_content(self, cr, uid, ids, name, args, context=None):
|
||||
res = {}
|
||||
for page in self.browse(cr, uid, ids, context=context):
|
||||
@ -140,9 +148,12 @@ class document_page_approval(orm.Model):
|
||||
else:
|
||||
history = self.pool.get('document.page.history')
|
||||
if self.is_approval_required(page):
|
||||
history_ids = history.search(cr, uid,[('page_id', '=', page.id),
|
||||
('state', '=', 'approved')], limit=1, order='create_date DESC')
|
||||
for h in history.browse(cr, uid, history_ids):
|
||||
history_ids = history.search(
|
||||
cr, uid, [
|
||||
('page_id', '=', page.id),
|
||||
('state', '=', 'approved')
|
||||
], limit=1, order='create_date DESC')
|
||||
for h in history.browse(cr, uid, history_ids, context=context):
|
||||
content = h.content
|
||||
else:
|
||||
content = page.content
|
||||
@ -154,8 +165,11 @@ class document_page_approval(orm.Model):
|
||||
for page in self.browse(cr, uid, ids, context=context):
|
||||
if self.is_approval_required(page):
|
||||
history = self.pool.get('document.page.history')
|
||||
history_ids = history.search(cr, uid,[('page_id', '=', page.id),
|
||||
('state', '=', 'approved')], limit=1, order='create_date DESC')
|
||||
history_ids = history.search(
|
||||
cr, uid, [
|
||||
('page_id', '=', page.id),
|
||||
('state', '=', 'approved')
|
||||
], limit=1, order='create_date DESC')
|
||||
approved_date = False
|
||||
for h in history.browse(cr, uid, history_ids):
|
||||
approved_date = h.approved_date
|
||||
@ -170,7 +184,8 @@ class document_page_approval(orm.Model):
|
||||
for page in self.browse(cr, uid, ids, context=context):
|
||||
if self.is_approval_required(page):
|
||||
history = self.pool.get('document.page.history')
|
||||
history_ids = history.search(cr, uid,[('page_id', '=', page.id),
|
||||
history_ids = history.search(cr, uid, [
|
||||
('page_id', '=', page.id),
|
||||
('state', '=', 'approved')], limit=1, order='create_date DESC')
|
||||
approved_uid = False
|
||||
for h in history.browse(cr, uid, history_ids):
|
||||
@ -198,15 +213,11 @@ class document_page_approval(orm.Model):
|
||||
return res
|
||||
|
||||
_columns = {
|
||||
'display_content': fields.function(_get_display_content,
|
||||
string='Displayed Content', type='text'),
|
||||
'approved_date': fields.function(_get_approved_date, string="Approved Date",
|
||||
type='datetime'),
|
||||
'approved_uid': fields.function(_get_approved_uid, string="Approved By",
|
||||
type='many2one', obj='res.users'),
|
||||
'display_content': fields.function(_get_display_content, string='Displayed Content', type='text'),
|
||||
'approved_date': fields.function(_get_approved_date, string="Approved Date", type='datetime'),
|
||||
'approved_uid': fields.function(_get_approved_uid, string="Approved By", type='many2one', obj='res.users'),
|
||||
'approval_required': fields.boolean("Require approval"),
|
||||
'is_parent_approval_required': fields.function(_is_parent_approval_required,
|
||||
string="parent approval", type='boolean'),
|
||||
'is_parent_approval_required': fields.function(
|
||||
_is_parent_approval_required, string="parent approval", type='boolean'),
|
||||
'approver_gid': fields.many2one("res.groups", "Approver group"),
|
||||
}
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
Loading…
Reference in New Issue
Block a user