NeoAnd/knowledge
1
0
Fork 0
mirror of https://github.com/OCA/knowledge.git synced 2025-07-25 01:48:41 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug on page creation

Browse Source 
(../7.0pageapproval/ rev 5)
This commit is contained in:
Jonatan Cloutier 2013-05-14 13:28:31 -04:00
parent 877beb8746
commit 8e8856ba67
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
document_page_approval/document_page_approval.py
View File

@ -48,6 +48,7 @@ class document_page_approval(orm.Model):
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=""
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:
@ -63,6 +64,7 @@ class document_page_approval(orm.Model):
for i in ids: for i in ids:
history = self.pool.get('document.page.history') history = self.pool.get('document.page.history')
history_ids = history.search(cr, uid,[('page_id', '=', i), ('state', '=', 'approved')], limit=1, order='create_date DESC') history_ids = history.search(cr, uid,[('page_id', '=', i), ('state', '=', 'approved')], limit=1, order='create_date DESC')
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[i] = approved_date res[i] = approved_date
@ -74,12 +76,12 @@ class document_page_approval(orm.Model):
for i in ids: for i in ids:
history = self.pool.get('document.page.history') history = self.pool.get('document.page.history')
history_ids = history.search(cr, uid,[('page_id', '=', i), ('state', '=', 'approved')], limit=1, order='create_date DESC') history_ids = history.search(cr, uid,[('page_id', '=', i), ('state', '=', 'approved')], limit=1, order='create_date DESC')
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[i] = approved_uid res[i] = approved_uid
return res return res
_columns = { _columns = {
'display_content': fields.function(_get_display_content, string='Displayed Content', type='text'), 'display_content': fields.function(_get_display_content, string='Displayed Content', type='text'),