This commit is contained in:
Sandy Carter 2014-07-18 16:36:08 -04:00 committed by Gabriela Mogollon
parent 9c5f955d26
commit 62a4b39fba
3 changed files with 112 additions and 104 deletions

View File

@ -1,6 +1,6 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# OpenERP, Open Source Management Solution # OpenERP, Open Source Management Solution
# Copyright (C) 2013 Savoir-faire Linux (<http://www.savoirfairelinux.com>). # Copyright (C) 2013 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
# #
@ -15,10 +15,8 @@
# GNU Affero General Public License for more details. # GNU Affero General Public License for more details.
# #
# You should have received a copy of the GNU Affero General Public License # You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
# #
############################################################################## ##############################################################################
import document_page_approval import document_page_approval
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

View File

@ -1,6 +1,6 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# OpenERP, Open Source Management Solution # OpenERP, Open Source Management Solution
# Copyright (C) 2013 Savoir-faire Linux (<http://www.savoirfairelinux.com>). # Copyright (C) 2013 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
# #
@ -15,16 +15,16 @@
# GNU Affero General Public License for more details. # GNU Affero General Public License for more details.
# #
# You should have received a copy of the GNU Affero General Public License # You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
# #
############################################################################## ##############################################################################
{ {
'name': 'Document Page Approval', 'name': 'Document Page Approval',
'version': '1.0', 'version': '1.0',
"author" : "Savoir-faire Linux", "author": "Savoir-faire Linux",
"website" : "http://www.savoirfairelinux.com", "website": "http://www.savoirfairelinux.com",
"license" : "AGPL-3", "license": "AGPL-3",
'category': 'Knowledge Management', 'category': 'Knowledge Management',
'description': """ 'description': """
This module adds a workflow to approve page modification and show the approved version by default. This module adds a workflow to approve page modification and show the approved version by default.
@ -33,7 +33,7 @@ Scenario
======== ========
* Set a valid email address on the company settings. * Set a valid email address on the company settings.
* Create a new page category and set an approver group. Make sure users belonging to that group * Create a new page category and set an approver group. Make sure users belonging to that group
have valid email addresses. have valid email addresses.
* Create a new page and choose the previously created category. * Create a new page and choose the previously created category.
* A notification is sent to the group with a link to the page history to review. * A notification is sent to the group with a link to the page history to review.
@ -52,6 +52,5 @@ Scenario
], ],
'installable': True, 'installable': True,
'auto_install': False, 'auto_install': False,
'images': ['images/category.png','images/page_history_list.png','images/page_history.png'], 'images': ['images/category.png', 'images/page_history_list.png', 'images/page_history.png'],
} }
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

View File

@ -1,6 +1,6 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# OpenERP, Open Source Management Solution # OpenERP, Open Source Management Solution
# Copyright (C) 2013 Savoir-faire Linux (<http://www.savoirfairelinux.com>). # Copyright (C) 2013 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
# #
@ -15,198 +15,209 @@
# GNU Affero General Public License for more details. # GNU Affero General Public License for more details.
# #
# You should have received a copy of the GNU Affero General Public License # You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
# #
############################################################################## ##############################################################################
from datetime import datetime
from openerp.osv import fields, orm from openerp.osv import fields, orm
from datetime import * from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT
class document_page_history_wkfl(orm.Model): class document_page_history_wkfl(orm.Model):
_inherit = 'document.page.history' _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' }) 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(
'document_page_approval', 'email_template_new_draft_need_approval')[1] cr, uid,
for page in self.browse(cr, uid, ids): 'document_page_approval', 'email_template_new_draft_need_approval')[1]
for page in self.browse(cr, uid, ids, context=context):
if page.is_parent_approval_required: if page.is_parent_approval_required:
self.pool.get('email.template').send_mail(cr, uid, template_id, self.pool.get('email.template').send_mail(
page.id, force_send=True) cr, uid, template_id, page.id, force_send=True
)
return True return True
def page_approval_approved(self, cr, uid, ids): def page_approval_approved(self, cr, uid, ids, context=None):
self.write(cr, uid, ids, { 'state' : 'approved', self.write(cr, uid, ids, {
'approved_date' : datetime.now().strftime('%Y-%m-%d %H:%M:%S'), 'state': 'approved',
'approved_uid': uid 'approved_date': datetime.now().strftime(DEFAULT_SERVER_DATETIME_FORMAT),
}) 'approved_uid': uid
}, context=context)
return True return True
def can_user_approve_page(self, cr, uid, ids, name, args, context=None): 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 = {} res = {}
for page in self.browse(cr, uid, ids, context=context): for page in self.browse(cr, uid, ids, context=context):
res[page.id]= self.can_user_approve_this_page(page.page_id, user) res[page.id] = self.can_user_approve_this_page(page.page_id, user)
return res return res
def can_user_approve_this_page(self, page, user): def can_user_approve_this_page(self, page, user):
if page: if page:
res = page.approver_gid in user.groups_id res = page.approver_gid in user.groups_id
res = res or self.can_user_approve_this_page(page.parent_id, user) res = res or self.can_user_approve_this_page(page.parent_id, user)
else: else:
res=False res = False
return res return res
def get_approvers_guids(self, cr, uid, ids, name, args, context=None): def get_approvers_guids(self, cr, uid, ids, name, args, context=None):
res = {} res = {}
for page in self.browse(cr, uid, ids, context=context): for page in self.browse(cr, uid, ids, context=context):
res[page.id]= self.get_approvers_guids_for_page(page.page_id) res[page.id] = self.get_approvers_guids_for_page(page.page_id)
return res return res
def get_approvers_guids_for_page(self, page): def get_approvers_guids_for_page(self, page):
if page: if page:
if page.approver_gid: if page.approver_gid:
res = [page.approver_gid.id] res = [page.approver_gid.id]
else: else:
res=[] res = []
res.extend(self.get_approvers_guids_for_page(page.parent_id)) res.extend(self.get_approvers_guids_for_page(page.parent_id))
else: else:
res=[] res = []
return res return res
def get_approvers_email(self, cr, uid, ids, name, args, context): def get_approvers_email(self, cr, uid, ids, name, args, context):
res = {} res = {}
for id in ids: for id in ids:
emails = '' emails = ''
guids = self.get_approvers_guids(cr, uid, ids, name, args, context=context) 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])]) 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: for user in users:
if user.email: if user.email:
emails += user.email emails += user.email
emails += ',' emails += ','
else: else:
empl_id = self.pool.get('hr.employee').search(cr, uid, empl_id = self.pool.get('hr.employee').search(
[('login','=',user.login)])[0] cr, uid, [('login', '=', user.login)])[0]
empl = self.pool.get('hr.employee').browse(cr, uid, empl_id) empl = self.pool.get('hr.employee').browse(cr, uid, empl_id, context=context)
if empl.work_email: if empl.work_email:
emails += empl.work_email emails += empl.work_email
emails += ',' emails += ','
emails = emails[:-1] emails = emails[:-1]
res[id] = emails res[id] = emails
return res return res
def get_page_url(self, cr, uid, ids, name, args, context): def get_page_url(self, cr, uid, ids, name, args, context):
res = {} res = {}
for id in ids: for id in ids:
base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, base_url = self.pool.get('ir.config_parameter').get_param(
'web.base.url', default='http://localhost:8069', context=context) 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 return res
_columns = { _columns = {
'state': fields.selection([ 'state': fields.selection([
('draft','Draft'), ('draft', 'Draft'),
('approved','Approved')], 'Status', readonly=True), ('approved', 'Approved')], 'Status', readonly=True),
'approved_date': fields.datetime("Approved Date"), 'approved_date': fields.datetime("Approved Date"),
'approved_uid': fields.many2one('res.users', "Approved By"), '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(
string="parent approval", type='boolean', store=False), 'page_id', 'is_parent_approval_required',
'can_user_approve_page': fields.function(can_user_approve_page, string="parent approval", type='boolean', store=False),
string="can user approve this page", type='boolean', store=False), 'can_user_approve_page': fields.function(
'get_approvers_email': fields.function(get_approvers_email, can_user_approve_page, string="can user approve this page", type='boolean', store=False),
string="get all approvers email", type='text', store=False), 'get_approvers_email': fields.function(
'get_page_url': fields.function(get_page_url, string="URL", type='text', get_approvers_email, string="get all approvers email", type='text', store=False),
store=False), 'get_page_url': fields.function(get_page_url, string="URL", type='text', store=False),
} }
class document_page_approval(orm.Model): class document_page_approval(orm.Model):
_inherit = 'document.page' _inherit = 'document.page'
def _get_display_content(self, cr, uid, ids, name, args, context=None): def _get_display_content(self, cr, uid, ids, name, args, context=None):
res = {} res = {}
for page in self.browse(cr, uid, ids, context=context): for page in self.browse(cr, uid, ids, context=context):
content="" content = ""
if page.type == "category": if page.type == "category":
content = self._get_page_index(cr, uid, page, link=False) content = self._get_page_index(cr, uid, page, link=False)
else: else:
history = self.pool.get('document.page.history') history = self.pool.get('document.page.history')
if self.is_approval_required(page): if self.is_approval_required(page):
history_ids = history.search(cr, uid,[('page_id', '=', page.id), history_ids = history.search(
('state', '=', 'approved')], limit=1, order='create_date DESC') cr, uid, [
for h in history.browse(cr, uid, history_ids): ('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 content = h.content
else: else:
content = page.content content = page.content
res[page.id] = content res[page.id] = content
return res return res
def _get_approved_date(self, cr, uid, ids, name, args, context=None): def _get_approved_date(self, cr, uid, ids, name, args, context=None):
res = {} res = {}
for page in self.browse(cr, uid, ids, context=context): for page in self.browse(cr, uid, ids, context=context):
if self.is_approval_required(page): if self.is_approval_required(page):
history = self.pool.get('document.page.history') history = self.pool.get('document.page.history')
history_ids = history.search(cr, uid,[('page_id', '=', page.id), history_ids = history.search(
('state', '=', 'approved')], limit=1, order='create_date DESC') cr, uid, [
('page_id', '=', page.id),
('state', '=', 'approved')
], limit=1, order='create_date DESC')
approved_date = False approved_date = False
for h in history.browse(cr, uid, history_ids): for h in history.browse(cr, uid, history_ids):
approved_date = h.approved_date approved_date = h.approved_date
res[page.id] = approved_date res[page.id] = approved_date
else: else:
res[page.id] = "" res[page.id] = ""
return res return res
def _get_approved_uid(self, cr, uid, ids, name, args, context=None): def _get_approved_uid(self, cr, uid, ids, name, args, context=None):
res = {} res = {}
for page in self.browse(cr, uid, ids, context=context): for page in self.browse(cr, uid, ids, context=context):
if self.is_approval_required(page): if self.is_approval_required(page):
history = self.pool.get('document.page.history') history = self.pool.get('document.page.history')
history_ids = history.search(cr, uid,[('page_id', '=', page.id), history_ids = history.search(cr, uid, [
('state', '=', 'approved')], limit=1, order='create_date DESC') ('page_id', '=', page.id),
('state', '=', 'approved')], limit=1, order='create_date DESC')
approved_uid = False approved_uid = False
for h in history.browse(cr, uid, history_ids): for h in history.browse(cr, uid, history_ids):
approved_uid = h.approved_uid.id approved_uid = h.approved_uid.id
res[page.id] = approved_uid res[page.id] = approved_uid
else: else:
res[page.id] = "" res[page.id] = ""
return res return res
def _is_parent_approval_required(self, cr, uid, ids, name, args, context=None): def _is_parent_approval_required(self, cr, uid, ids, name, args, context=None):
res = {} res = {}
for page in self.browse(cr, uid, ids, context=context): for page in self.browse(cr, uid, ids, context=context):
res[page.id]= self.is_approval_required(page) res[page.id] = self.is_approval_required(page)
return res return res
def is_approval_required(self, page): def is_approval_required(self, page):
if page: if page:
res = page.approval_required res = page.approval_required
res = res or self.is_approval_required(page.parent_id) res = res or self.is_approval_required(page.parent_id)
else: else:
res=False res = False
return res return res
_columns = { _columns = {
'display_content': fields.function(_get_display_content, 'display_content': fields.function(_get_display_content, string='Displayed Content', type='text'),
string='Displayed Content', type='text'), 'approved_date': fields.function(_get_approved_date, string="Approved Date", type='datetime'),
'approved_date': fields.function(_get_approved_date, string="Approved Date", 'approved_uid': fields.function(_get_approved_uid, string="Approved By", type='many2one', obj='res.users'),
type='datetime'),
'approved_uid': fields.function(_get_approved_uid, string="Approved By",
type='many2one', obj='res.users'),
'approval_required': fields.boolean("Require approval"), 'approval_required': fields.boolean("Require approval"),
'is_parent_approval_required': fields.function(_is_parent_approval_required, 'is_parent_approval_required': fields.function(
string="parent approval", type='boolean'), _is_parent_approval_required, string="parent approval", type='boolean'),
'approver_gid': fields.many2one("res.groups", "Approver group"), 'approver_gid': fields.many2one("res.groups", "Approver group"),
} }
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: