pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP]: wiki: Minor improvements

Browse Source 
bzr revid: rpa@tinyerp.com-20100317092712-zizbyvkg82o8cx03
This commit is contained in:
rpa (Open ERP)
2010-03-17 14:57:12 +05:30
parent 4df6498acf
commit 174ae8258e
7 changed files with 89 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/wiki/wiki.py
+47 -47
View File
@@ -44,19 +44,19 @@ class WikiGroup(osv.osv):
_order = 'name'
_columns = {
'name':fields.char('Wiki Group', size=256, select=True, required=True),
'page_ids':fields.one2many('wiki.wiki', 'group_id', 'Pages'),
'notes':fields.text("Description"),
'create_date':fields.datetime("Created Date", select=True),
'template': fields.text('Wiki Template'),
'section': fields.boolean("Make Section ?"),
'name':fields.char('Wiki Group', size=256, select=True, required=True),
'page_ids':fields.one2many('wiki.wiki', 'group_id', 'Pages'),
'notes':fields.text("Description"),
'create_date':fields.datetime("Created Date", select=True),
'template': fields.text('Wiki Template'),
'section': fields.boolean("Make Section ?"),
'method':fields.selection([('list', 'List'), ('page', 'Home Page'), \
('tree', 'Tree')], 'Display Method'),
'home':fields.many2one('wiki.wiki', 'Pages'),
('tree', 'Tree')], 'Display Method'),
'home':fields.many2one('wiki.wiki', 'Pages'),
}
_defaults = {
'method': lambda *a: 'page',
'method': lambda *a: 'page',
}
WikiGroup()
@@ -70,7 +70,7 @@ class GroupLink(osv.osv):
_rec_name = 'action_id'
_columns = {
'group_id': fields.many2one('wiki.groups', 'Parent Group', ondelete='set null'),
'group_id': fields.many2one('wiki.groups', 'Parent Group', ondelete='set null'),
'action_id': fields.many2one('ir.ui.menu', 'Menu')
}
@@ -85,22 +85,22 @@ class Wiki(osv.osv):
_order = 'section,create_date desc'
_columns = {
'name': fields.char('Title', size=256, select=True, required=True),
'write_uid': fields.many2one('res.users',"Last Author"),
'text_area': fields.text("Content"),
'create_uid': fields.many2one('res.users','Author', select=True),
'create_date': fields.datetime("Created on", select=True),
'write_date': fields.datetime("Modification Date", select=True),
'tags': fields.char('Tags', size=1024),
'history_id': fields.one2many('wiki.wiki.history','wiki_id','History Lines'),
'minor_edit': fields.boolean('Minor edit', select=True),
'summary': fields.char('Summary',size=256),
'section': fields.char('Sequence', size=32, help="Use page section code like 1.2.1"),
'group_id': fields.many2one('wiki.groups', 'Wiki Group', select=1, ondelete='set null'),
'toc': fields.boolean('Table of Contents'),
'review': fields.boolean('Need Review'),
'parent_id': fields.many2one('wiki.wiki', 'Parent Page'),
'child_ids': fields.one2many('wiki.wiki', 'parent_id', 'Child Pages'),
'name': fields.char('Title', size=256, select=True, required=True),
'write_uid': fields.many2one('res.users', "Last Author"),
'text_area': fields.text("Content"),
'create_uid': fields.many2one('res.users', 'Author', select=True),
'create_date': fields.datetime("Created on", select=True),
'write_date': fields.datetime("Modification Date", select=True),
'tags': fields.char('Tags', size=1024),
'history_id': fields.one2many('wiki.wiki.history', 'wiki_id', 'History Lines'),
'minor_edit': fields.boolean('Minor edit', select=True),
'summary': fields.char('Summary', size=256),
'section': fields.char('Sequence', size=32, help="Use page section code like 1.2.1"),
'group_id': fields.many2one('wiki.groups', 'Wiki Group', select=1, ondelete='set null'),
'toc': fields.boolean('Table of Contents'),
'review': fields.boolean('Need Review'),
'parent_id': fields.many2one('wiki.wiki', 'Parent Page'),
'child_ids': fields.one2many('wiki.wiki', 'parent_id', 'Child Pages'),
}
def onchange_group_id(self, cr, uid, ids, group_id, content, context={}):
@@ -108,7 +108,7 @@ class Wiki(osv.osv):
""" @param cr: the current row, from the database cursor,
@param uid: the current user’s ID for security checks,
@param ids: List of wiki page’s IDs
@return : dictionay of open wiki page on give page section """
@return: dictionay of open wiki page on give page section """
if (not group_id) or content:
return {}
@@ -125,7 +125,7 @@ class Wiki(osv.osv):
section = '.'.join(s)
return {
'value':{
'text_area': template,
'text_area': template,
'section': section
}
}
@@ -143,15 +143,15 @@ class Wiki(osv.osv):
""" @param cr: the current row, from the database cursor,
@param uid: the current user’s ID for security checks, """
id = super(Wiki,self).create(cr, uid, vals, context)
id = super(Wiki, self).create(cr, uid, vals, context)
history = self.pool.get('wiki.wiki.history')
if vals.get('text_area'):
res = {
'minor_edit':vals.get('minor_edit', True),
'text_area':vals.get('text_area',''),
'write_uid':uid,
'wiki_id' : id,
'summary':vals.get('summary','')
'minor_edit': vals.get('minor_edit', True),
'text_area': vals.get('text_area', ''),
'write_uid': uid,
'wiki_id': id,
'summary':vals.get('summary', '')
}
history.create(cr, uid, res)
return id
@@ -166,11 +166,11 @@ class Wiki(osv.osv):
if vals.get('text_area'):
for id in ids:
res = {
'minor_edit':vals.get('minor_edit', True),
'text_area':vals.get('text_area',''),
'write_uid':uid,
'wiki_id' : id,
'summary':vals.get('summary','')
'minor_edit': vals.get('minor_edit', True),
'text_area': vals.get('text_area', ''),
'write_uid': uid,
'wiki_id': id,
'summary': vals.get('summary', '')
}
history.create(cr, uid, res)
return result
@@ -187,16 +187,16 @@ class History(osv.osv):
_order = 'id DESC'
_columns = {
'create_date': fields.datetime("Date",select=True),
'text_area': fields.text("Text area"),
'minor_edit': fields.boolean('This is a major edit ?',select=True),
'summary': fields.char('Summary',size=256, select=True),
'write_uid': fields.many2one('res.users',"Modify By", select=True),
'wiki_id': fields.many2one('wiki.wiki','Wiki Id', select=True)
}
'create_date': fields.datetime("Date", select=True),
'text_area': fields.text("Text area"),
'minor_edit': fields.boolean('This is a major edit ?', select=True),
'summary': fields.char('Summary', size=256, select=True),
'write_uid': fields.many2one('res.users', "Modify By", select=True),
'wiki_id': fields.many2one('wiki.wiki', 'Wiki Id', select=True)
}
_defaults = {
'write_uid': lambda obj,cr,uid,context: uid,
'write_uid': lambda obj, cr, uid, context: uid,
}
def getDiff(self, cr, uid, v1, v2, context={}):
addons/wiki/wiki_view.xml
+1
View File
@@ -253,5 +253,6 @@
<field eval="'ir.actions.wizard,%d'%action_view_wiki_wiki_page_open" name="value"/>
<field eval="True" name="object"/>
</record>
</data>
</openerp>
addons/wiki/wizard/show_diff.py
+4 -3
View File
@@ -19,7 +19,8 @@
#
##############################################################################
from osv import fields,osv
from osv import fields, osv
from tools.translate import _
class showdiff(osv.osv_memory):
""" Disp[ay Difference for History """
@@ -43,7 +44,7 @@ class showdiff(osv.osv_memory):
elif len(ids) == 1:
old = history.browse(cr, uid, ids[0])
nids = history.search(cr, uid, [('wiki_id','=',old.wiki_id.id)])
nids = history.search(cr, uid, [('wiki_id', '=', old.wiki_id.id)])
nids.sort()
diff = history.getDiff(cr, uid, ids[0], nids[-1])
else:
@@ -51,7 +52,7 @@ class showdiff(osv.osv_memory):
return diff
_columns = {
'diff': fields.text('Diff'),
'diff': fields.text('Diff'),
}
_defaults = {
addons/wiki/wizard/wiki_create_menu.py
+14 -13
View File
@@ -28,9 +28,9 @@ class wiki_create_menu(osv.osv_memory):
_description = "Wizard Create Menu"
_columns = {
'menu_name': fields.char('Menu Name', size=256, select=True, required=True),
'menu_parent_id': fields.many2one('ir.ui.menu', 'Parent Menu', required=True),
'page': fields.many2one('wiki.wiki', 'Group Home Page'),
'menu_name': fields.char('Menu Name', size=256, select=True, required=True),
'menu_parent_id': fields.many2one('ir.ui.menu', 'Parent Menu', required=True),
'page': fields.many2one('wiki.wiki', 'Group Home Page'),
}
def wiki_menu_create(self, cr, uid, ids, context):
@@ -42,25 +42,26 @@ class wiki_create_menu(osv.osv_memory):
"""
mod_obj = self.pool.get('ir.model.data')
action_id = mod_obj._get_id(cr, uid, 'wiki','action_view_wiki_wiki_page_open')
action_id = mod_obj._get_id(cr, uid, 'wiki', 'action_view_wiki_wiki_page_open')
for menu in self.browse(cr, uid, ids):
menu_id = self.pool.get('ir.ui.menu').create(cr, uid, {
'name':menu.menu_name,
'parent_id':menu.menu_parent_id.id,
'icon': 'STOCK_DIALOG_QUESTION',
'action': 'ir.actions.act_window,'+ str(action_id)
}, context)
'name':menu.menu_name,
'parent_id':menu.menu_parent_id.id,
'icon': 'STOCK_DIALOG_QUESTION',
'action': 'ir.actions.act_window,'+ str(action_id)
}, context)
home = menu.page.id
group_id = menu.id
res = {
'home':home,
}
'home':home,
}
self.pool.get('wiki.groups').write(cr, uid, ids, res)
self.pool.get('wiki.groups.link').create(cr, uid,
self.pool.get('wiki.groups.link').create(cr, uid,
{'group_id': group_id, 'action_id': menu_id})
return {}
wiki_create_menu()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/wiki/wizard/wiki_make_index.py
+5 -2
View File
@@ -36,13 +36,15 @@ class wiki_make_index(osv.osv_memory):
"""
data = context and context.get('active_ids', []) or []
for index_obj in self.browse(cr,uid,ids):
for index_obj in self.browse(cr, uid, ids):
wiki_pool = self.pool.get('wiki.wiki')
cr.execute("Select id, section from wiki_wiki where id = ANY(%s) \
order by section " ,(data,))
order by section ", (data,))
lst0 = cr.fetchall()
lst = []
s_ids = {}
for l in lst0:
s_ids[l[1]] = l[0]
lst.append(l[1])
@@ -82,6 +84,7 @@ class wiki_make_index(osv.osv_memory):
for rs in result:
wiki_pool.write(cr, uid, [rs[1]], {'section':rs[0]})
return {}
wiki_make_index()
addons/wiki/wizard/wiki_wiki_help_open.py
+7 -7
View File
@@ -35,15 +35,15 @@ class wiki_wiki_help_open(osv.osv_memory):
@param ids: List of wiki page’s IDs
"""
pages = self.pool.get('wiki.wiki').search(cr, uid, [('name','=','Basic Wiki Editing')])
pages = self.pool.get('wiki.wiki').search(cr, uid, [('name', '=', 'Basic Wiki Editing')])
value = {
'view_type': 'form',
'view_mode': 'form,tree',
'res_model': 'wiki.wiki',
'view_id': False,
'res_id': pages[0],
'type': 'ir.actions.act_window',
'view_type': 'form',
'view_mode': 'form,tree',
'res_model': 'wiki.wiki',
'view_id': False,
'res_id': pages[0],
'type': 'ir.actions.act_window',
}
return value
addons/wiki/wizard/wiki_wiki_page_open.py
+11 -11
View File
@@ -33,19 +33,19 @@ class wiki_wiki_page_open(osv.osv_memory):
@param cr: the current row, from the database cursor,
@param uid: the current user’s ID for security checks,
@param ids: List of open wiki page’s IDs
@return : dictionay of open wiki window on give group id
@return: dictionay of open wiki window on give group id
"""
for group in self.pool.get('wiki.groups').browse(cr, uid,ids):
for group in self.pool.get('wiki.groups').browse(cr, uid, ids):
value = {
'domain': "[('group_id','=',%d)]" % (group.id),
'name': 'Wiki Page',
'view_type': 'form',
'view_mode': 'form,tree',
'res_model': 'wiki.wiki',
'view_id': False,
'type': 'ir.actions.act_window',
'domain': "[('group_id','=',%d)]" % (group.id),
'name': 'Wiki Page',
'view_type': 'form',
'view_mode': 'form,tree',
'res_model': 'wiki.wiki',
'view_id': False,
'type': 'ir.actions.act_window',
}
if group.method == 'page':
value['res_id'] = group.home.id
@@ -53,9 +53,9 @@ class wiki_wiki_page_open(osv.osv_memory):
value['view_type'] = 'form'
value['view_mode'] = 'tree,form'
elif group.method == 'tree':
view_id = pool.get('ir.ui.view').search(cr, uid, [('name','=','wiki.wiki.tree.childs')])
view_id = self.pool.get('ir.ui.view').search(cr, uid, [('name', '=', 'wiki.wiki.tree.childs')])
value['view_id'] = view_id
value['domain'] = [('group_id','=',group.id),('parent_id','=',False)]
value['domain'] = [('group_id', '=', group.id), ('parent_id', '=', False)]
value['view_type'] = 'tree'
return value