diff --git a/addons/wiki/__terp__.py b/addons/wiki/__terp__.py index b15346dba39..16c82e60d6b 100644 --- a/addons/wiki/__terp__.py +++ b/addons/wiki/__terp__.py @@ -33,11 +33,11 @@ 'depends': ['base'], 'init_xml': [], 'update_xml': [ - 'wizard/wizard_view.xml', + # 'wizard/wizard_view.xml', 'wizard/wiki_wiki_page_open_view.xml', 'wizard/wiki_create_menu_view.xml', - 'wizard/wiki_wiki_help_open_view.xml', 'wizard/wiki_make_index_view.xml', + 'wizard/wiki_show_diff_view.xml', 'wiki_view.xml', 'data/wiki_quickstart.xml', 'data/wiki_main.xml', diff --git a/addons/wiki/security/ir.model.access.csv b/addons/wiki/security/ir.model.access.csv index 9ddfa27eee2..14ee1c656db 100644 --- a/addons/wiki/security/ir.model.access.csv +++ b/addons/wiki/security/ir.model.access.csv @@ -8,5 +8,4 @@ "wiki_wizard_wiki_history_show_diff","wizard.wiki.history.show_diff","model_wizard_wiki_history_show_diff","base.group_user",1,1,1,1 "wiki_wiki_page_open","wiki.wiki.page.open","model_wiki_wiki_page_open","base.group_user",1,1,1,1 "wiki_create_menu","wiki.create.menu","model_wiki_create_menu","base.group_user",1,1,1,1 -"wiki_wiki_help_open","wiki.wiki.help.open","model_wiki_wiki_help_open","base.group_user",1,1,1,1 "wiki_make_index","wiki.make.index","model_wiki_make_index","base.group_user",1,1,1,1 diff --git a/addons/wiki/wiki.py b/addons/wiki/wiki.py index bdb92c64f20..442a9c3b432 100644 --- a/addons/wiki/wiki.py +++ b/addons/wiki/wiki.py @@ -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', 'Home Page'), + ('tree', 'Tree')], 'Display Method'), + 'home':fields.many2one('wiki.wiki', 'Home Page'), } _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={}): @@ -125,7 +125,7 @@ class Wiki(osv.osv): section = '.'.join(s) return { 'value':{ - 'text_area': template, + 'text_area': template, 'section': section } } @@ -147,10 +147,10 @@ class Wiki(osv.osv): 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, + '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) @@ -166,15 +166,38 @@ 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, + '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 + def open_wiki_page(self, cr, uid, ids, context): + + """ Opens Wiki Page for Editing + @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 + + """ + pages = self.pool.get('wiki.wiki').search(cr, uid, [('name', '=', 'Basic Wiki Editing')]) + if not pages: + return {} + value = { + 'view_type': 'form', + 'view_mode': 'form,tree', + 'res_model': 'wiki.wiki', + 'view_id': False, + 'res_id': pages[0], + 'type': 'ir.actions.act_window', + 'nodestroy':True, + } + + return value + Wiki() @@ -187,16 +210,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), + '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={}): diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml index 875aa460f6a..592a6d49f47 100644 --- a/addons/wiki/wiki_view.xml +++ b/addons/wiki/wiki_view.xml @@ -124,12 +124,15 @@ form
- + +