diff --git a/addons/wiki/__init__.py b/addons/wiki/__init__.py
index 98cdc450bae..608266dc774 100644
--- a/addons/wiki/__init__.py
+++ b/addons/wiki/__init__.py
@@ -1,2 +1,3 @@
import wiki
+import wizard
\ No newline at end of file
diff --git a/addons/wiki/__terp__.py b/addons/wiki/__terp__.py
index e458cfdc1a5..2919e1bbf50 100644
--- a/addons/wiki/__terp__.py
+++ b/addons/wiki/__terp__.py
@@ -1,9 +1,15 @@
{
- "name" : "Wiki System",
+ "name" : "Document Management - Wiki",
"version" : "1.0",
- "author" : "Tiny ERP",
+ "author" : "Tiny",
+ "description": """
+ The base module to manage documents(wiki)
+
+ keep track for the wiki groups, pages, and history
+ """,
"category" : "Generic Modules/Others",
"depends" : ["base"],
+ "website" : "http://openerp.com",
"init_xml" : [],
"demo_xml" : [],
"update_xml" : [
diff --git a/addons/wiki/wiki.py b/addons/wiki/wiki.py
index baed3b37d02..0e8dfa3db8b 100644
--- a/addons/wiki/wiki.py
+++ b/addons/wiki/wiki.py
@@ -31,27 +31,37 @@ import time
from StringIO import StringIO
from HTMLParser import HTMLParser
-class Wiki(osv.osv):
- _name="wiki.wiki"
- _description="Wiki"
+class WikiGroup(osv.osv):
+ _name = "wiki.groups"
+ _description="Wiki Groups"
_order = 'name'
_columns={
- 'name':fields.char('Title', size=128, select=True, required=True),
- 'write_uid':fields.many2one('res.users',"Last Modify By"),
- 'text_area':fields.text("Content", select=True),
- 'create_uid':fields.many2one('res.users','Authour', select=True),
+ 'name':fields.char('Wiki Group', size=256, select=True, required=True),
+ 'parent_id':fields.many2one('wiki.groups', 'Parent Group', ondelete='set null'),
+ 'notes':fields.text("Description", select=True),
'create_date':fields.datetime("Created on", select=True),
- 'write_date':fields.datetime("Last modified", select=True),
- 'tags':fields.char('Tags', size=1024),
- 'history_id':fields.one2many('wiki.wiki.history','history_wiki_id','History Lines'),
- 'minor_edit':fields.boolean('Thisd is a minor edit', select=True),
- 'summary':fields.char('Summary',size=256, select=True),
}
+WikiGroup()
- def __init__(self, cr, pool):
- super(Wiki, self).__init__(cr, pool)
- self.oldmodel = None
+class Wiki(osv.osv):
+ _name="wiki.wiki"
+ _description="Wiki Page"
+ _order = 'section,name'
+ _columns={
+ 'name':fields.char('Title', size=256, select=True, required=True),
+ 'write_uid':fields.many2one('res.users',"Last Modified By"),
+ 'text_area':fields.text("Content", select=True),
+ 'create_uid':fields.many2one('res.users','Author', select=True),
+ 'create_date':fields.datetime("Created on", select=True),
+ 'write_date':fields.datetime("Last modified", select=True),
+ 'tags':fields.char('Tags', size=1024),
+ 'history_id':fields.one2many('wiki.wiki.history','history_wiki_id','History Lines'),
+ 'minor_edit':fields.boolean('Minor edit', select=True),
+ 'summary':fields.char('Summary',size=256, select=True),
+ 'section': fields.char('Section', size=32)
+ 'group_id':fields.many2one('wiki.groups', 'Wiki Group', select=1, ondelete='set null'),
+ }
def read(self, cr, uid, cids, fields=None, context=None, load='_classic_read'):
ids = []
for id in cids:
@@ -59,26 +69,17 @@ class Wiki(osv.osv):
ids.append(id)
elif type(id) == type(u''):
ids.append(10)
-
result = super(Wiki, self).read(cr, uid, ids, fields, None, load='_classic_read')
return result
- def create(self, cr, uid, vals, context=None):
- if not vals.has_key('minor_edit'):
- return super(Wiki,self).create(cr, uid, vals, context)
- vals['history_id']=[[0,0,{'minor_edit':vals['minor_edit'],'text_area':vals['text_area'],'summary':vals['summary']}]]
- return super(Wiki,self).create(cr, uid, vals, context)
-
def write(self, cr, uid, ids, vals, context=None):
if vals.get('text_area'):
- if vals.has_key('minor_edit') and vals.has_key('summary'):
- vals['history_id']=[[0,0,{'minor_edit':vals['minor_edit'],'text_area':vals['text_area'],'modify_by':uid,'summary':vals['summary']}]]
- elif vals.has_key('minor_edit'):
- vals['history_id']=[[0,0,{'minor_edit':vals['minor_edit'],'text_area':vals['text_area'],'modify_by':uid,'summary':wiki_data['summary']}]]
- elif vals.has_key('summary'):
- vals['history_id']=[[0,0,{'minor_edit':wiki_data['summary'],'text_area':vals['text_area'],'modify_by':uid,'summary':vals['summary']}]]
- else:
- vals['history_id']=[[0,0,{'minor_edit':wiki_data['minor_edit'],'text_area':vals['text_area'],'modify_by':uid,'summary':wiki_data['summary']}]]
+ vals['history_id']=[(0,0,{
+ 'minor_edit':vals.get('minor_edit', False),
+ 'text_area':vals['text_area'],
+ 'modify_by':uid,
+ 'summary':vals.get('summary','')
+ })]
return super(Wiki,self).write(cr, uid, ids, vals, context)
Wiki()
@@ -100,19 +101,13 @@ class History(osv.osv):
'hist_write_date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
'modify_by': lambda obj,cr,uid,context: uid,
}
-
def getDiff(self, cr, uid, v1, v2, context={}):
import difflib
-
history_pool = self.pool.get('wiki.wiki.history')
-
text1 = history_pool.read(cr, uid, [v1], ['text_area'])[0]['text_area']
text2 = history_pool.read(cr, uid, [v2], ['text_area'])[0]['text_area']
-
line1 = text1.splitlines(1)
line2 = text2.splitlines(1)
-
diff = difflib.HtmlDiff()
-
return diff.make_file(line1, line2, "Revision-%s" % (v1), "Revision-%s" % (v2), context=False)
-History()
\ No newline at end of file
+History()
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index c135e7427f7..f9ea0f9232b 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -1,142 +1,133 @@
-
-
-
- wiki.wiki.tree
- wiki.wiki
- tree
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+ wiki.groups.tree
+ wiki.groups
+ tree
+
+
+
+
+
+
+
+
+
+ wiki.groups.form
+ wiki.groups
+ form
+
+
+
+
-
- wiki.wiki.form
- wiki.wiki
- form
-
-
-
-
+
+ Wiki Groups
+ wiki.groups
+ form
+ form,tree
+
+
-
- Wiki Pages
- wiki.wiki
- form
- form,tree
-
-
+
+
+
+ wiki.wiki.tree
+ wiki.wiki
+ tree
+
+
+
+
+
+
+
+
-
+
+ wiki.wiki.form
+ wiki.wiki
+ form
+
+
+
+
-
- wiki.wiki.history.tree
- wiki.wiki.history
- tree
-
-
-
-
-
-
-
-
-
-
-
- wiki.wiki.history.form
- wiki.wiki.history
- form
-
-
-
-
+
+ Wiki Pages
+ wiki.wiki
+ form
+ form,tree
+
+
-
- Wiki History
- wiki.wiki.history
- form
- form,tree
-
-
+
-
+
+ wiki.wiki.history.tree
+ wiki.wiki.history
+ tree
+
+
+
+
+
+
+
+
+
+
+
+ wiki.wiki.history.form
+ wiki.wiki.history
+ form
+
+
+
+
-
- wiki.index.line.form
- wiki.index.line
- form
-
-
-
-
-
-
- wiki.index.line.tree
- wiki.index.line
- form
-
-
-
-
-
-
-
+
+ Wiki History
+ wiki.wiki.history
+ form
+ form,tree
+
+
-
- Index Server
- wiki.index.line
- form
- tree,form
-
-
-
-
-
-
-
\ No newline at end of file
+
+
+
+
+
diff --git a/addons/wiki/wizard/__init__.py b/addons/wiki/wizard/__init__.py
new file mode 100644
index 00000000000..2d0a1a53130
--- /dev/null
+++ b/addons/wiki/wizard/__init__.py
@@ -0,0 +1 @@
+import create_menu
\ No newline at end of file
diff --git a/addons/wiki/wizard/create_menu.py b/addons/wiki/wizard/create_menu.py
new file mode 100644
index 00000000000..9d688b34f1c
--- /dev/null
+++ b/addons/wiki/wizard/create_menu.py
@@ -0,0 +1,76 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2008 Tiny SPRL (). All Rights Reserved
+# $Id$
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see .
+#
+##############################################################################
+
+
+import time
+import wizard
+import osv
+import pooler
+
+section_form = '''
+'''
+
+section_fields = {
+ 'menu_name': {'string':'Menu Name', 'type':'char', 'required':True, 'size':64},
+ 'menu_parent_id': {'string':'Parent Menu', 'type':'many2one', 'relation':'ir.ui.menu', 'required':True},
+}
+
+def report_menu_create(self, cr, uid, data, context):
+ pool = pooler.get_pool(cr.dbname)
+ group = pool.get('wiki.groups').browse(cr, uid, data['id'])
+
+ action_id = pool.get('ir.actions.act_window').create(cr, uid, {
+ 'name': group.name,
+ 'view_type':'form',
+ 'view_mode':"tree,form",
+ 'context': "{'group_id':%d}" % (group.id,),
+ 'domain': "[('group_id','child_of',%d)]" % (group.id,),
+ 'res_model': 'wiki.wiki'
+ })
+ pool.get('ir.ui.menu').create(cr, uid, {
+ 'name': data['form']['menu_name'],
+ 'parent_id': data['form']['menu_parent_id'],
+ 'icon': 'STOCK_JUSTIFY_FILL',
+ 'action': 'ir.actions.act_window,'+str(action_id)
+ }, context)
+ return {}
+
+class wizard_create_menu(wizard.interface):
+ states = {
+ 'init': {
+ 'actions': [],
+ 'result': {'type':'form', 'arch':section_form, 'fields':section_fields, 'state':[('end','Cancel'),('create_menu','Create Menu')]}
+ },
+ 'create_menu': {
+ 'actions': [report_menu_create],
+ 'result': {
+ 'type':'state',
+ 'state':'end'
+ }
+ }
+ }
+wizard_create_menu('wiki.create.menu')
+