From 4cb094c3979e3792ab4867167933812d0ac8f404 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Fri, 21 Nov 2008 19:19:08 +0530
Subject: [PATCH 1/6] remove unused items fromt the view

bzr revid: mga@tinyerp.com-20081121134908-6opdlfsx7kjhb91x
---
 addons/wiki/wiki_view.xml | 37 -------------------------------------
 1 file changed, 37 deletions(-)

diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index c135e7427f7..8ebb38b72e8 100755
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -101,42 +101,5 @@
 
 			<menuitem name="Wiki System/History" id="menu_action_history" action="action_history"/>
 
-			<record model="ir.ui.view" id="action_base_index_line_form">
-				<field name="name">wiki.index.line.form</field>
-				<field name="model">wiki.index.line</field>
-				<field name="type">form</field>
-				<field name="arch" type="xml">
-					<form srting="Index Line">
-						<field name="model" select="1"/>
-						<field name="res_id" select="1"/>
-						<field name="name" colspan="4"/>
-						<label string=""/>
-						<button string="Create Index" name="createIndex" type="object"/>
-					</form>
-				</field>
-			</record>
-			
-			<record model="ir.ui.view" id="action_base_index_line_tree">
-				<field name="name">wiki.index.line.tree</field>
-				<field name="model">wiki.index.line</field>
-				<field name="type">form</field>
-				<field name="arch" type="xml">
-					<tree srting="Index Lines">
-						<field name="model" select="1"/>
-						<field name="res_id" select="1"/>
-					</tree>
-				</field>
-			</record>
-
-			<record model="ir.actions.act_window" id="action_base_index_line">
-				<field name="name">Index Server</field>
-				<field name="res_model">wiki.index.line</field>
-				<field name="view_type">form</field>
-				<field name="view_mode">tree,form</field>
-				<field name="view_id" ref="action_base_index_line_form"/>
-			</record>
-
-			<menuitem name="Wiki System/Configuration/Index Lines" id="menu_action_base_index_line" sequence="0" action="action_base_index_line"/>
-			
 		</data>
 	</terp>
\ No newline at end of file

From f2d5d3ef82cee936dc4cd5d8e44865ddbe3eb1c1 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Fri, 21 Nov 2008 20:39:23 +0530
Subject: [PATCH 2/6] adding the wizard to create a menu for the groups

bzr revid: mga@tinyerp.com-20081121150923-g7j0gfugdp0surcq
---
 addons/wiki/__init__.py   |   1 +
 addons/wiki/__terp__.py   |  10 +-
 addons/wiki/wiki.py       |  32 ++++--
 addons/wiki/wiki_view.xml | 226 +++++++++++++++++++++-----------------
 4 files changed, 157 insertions(+), 112 deletions(-)

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 100755
--- 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..bb26a8b1fb2 100755
--- a/addons/wiki/wiki.py
+++ b/addons/wiki/wiki.py
@@ -31,21 +31,33 @@ import time
 from StringIO import StringIO
 from HTMLParser import HTMLParser
 
+class WikiGroup(osv.osv):
+    _name = "wiki.groups"
+    _description="Wiki Groups"
+    _order = 'name'
+    _columns={
+       'name':fields.char('Name', size=256, select=True, required=True),
+       'notes':fields.text("Description", select=True),
+       'create_date':fields.datetime("Created on", select=True),
+    }
+WikiGroup()
+
 class Wiki(osv.osv):
     _name="wiki.wiki"
     _description="Wiki"
     _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),
-       '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),
+        'group_id':fields.many2one('wiki.groups', 'Group'),
+        'name':fields.char('Title', size=256, 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),
+        '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),
     }
 
     def __init__(self, cr, pool):
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index 8ebb38b72e8..477d6a4f670 100755
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -1,105 +1,131 @@
 <?xml version="1.0"?>
-	<terp>
-		<data>
-			<record model="ir.ui.view" id="view_wiki_tree">
-				<field name="name">wiki.wiki.tree</field>
-				<field name="model">wiki.wiki</field>
-				<field name="type">tree</field>
-				<field name="arch" type="xml">
-					<tree string="Wiki">
-						<field name="name"/>
-						<field name="create_uid" string="Authour"/>
-						<field name="create_date" string="Created on"/>
-					</tree>
-				</field>
-			</record>
-
-			<record model="ir.ui.view" id="view_wiki_form">
-				<field name="name">wiki.wiki.form</field>
-				<field name="model">wiki.wiki</field>
-				<field name="type">form</field>
-				<field name="arch" type="xml">
-					<form string="Wiki">
-						<field name="name" colspan="4" search="1"/>
-						<field name="write_date" readonly="1" search="1"/>
-						<field name="write_uid" readonly="1" search="1"/>
-						<notebook colspan="4">
-							<page string="Article">
-								<separator string="Wiki Content" colspan="4"/>
-								<field name="text_area" nolabel="1" colspan="4" search="1" widget="text_wiki"/>
-								
-								<separator string="Tags" colspan="4" />
-								<field name="tags" nolabel="1" colspan="4" search="1"/>
-								<field name="minor_edit" search="1"/>
-								<field name="summary" search="1"/>
-							</page>
-							<page string="History">
-								<field name="history_id" mode="tree,form" colspan="4" nolabel="1" select="1">
-									<tree string="History">
-										<field name="text_area" />
-										<field name="modify_by" />
-									</tree>
-									<form string="History">
-										<field name="text_area" colspan="4"/>
-										<field name="modify_by" />
-										<field name="minor_edit" />
-										<field name="summary" colspan="4"/>
-									</form>
-								</field>
-							</page>
-						</notebook>
-					</form>
-				</field>
-			</record>
-
-			<record model="ir.actions.act_window" id="action_wiki">
-				<field name="name">Wiki Pages</field>
-				<field name="res_model">wiki.wiki</field>
-				<field name="view_type">form</field>
-				<field name="view_mode">form,tree</field>
-				<field name="view_id" ref="view_wiki_tree"/>
-			</record>
-
-			<menuitem name="Wiki System/Wiki Pages" id="menu_action_wiki_wiki" action="action_wiki"/>
-
-			<record model="ir.ui.view" id="view_wiki_history_tree">
-				<field name="name">wiki.wiki.history.tree</field>
-				<field name="model">wiki.wiki.history</field>
-				<field name="type">tree</field>
-				<field name="arch" type="xml">
-					<tree srting="Wiki History">
-						<field name="date_time"/>
-						<field name="text_area"/>
-						<field name="minor_edit"/>
-						<field name="summary"/>
-					</tree>
-				</field>
-			</record>
+<openerp>
+	<data>
+	
+		<wizard
+			id="wizard_group_menu_create"
+			string="Create Menu"
+			name="wiki.create.menu"/>
 			
-			<record model="ir.ui.view" id="wiki_history_form">
-				<field name="name">wiki.wiki.history.form</field>
-				<field name="model">wiki.wiki.history</field>
-				<field name="type">form</field>
-				<field name="arch" type="xml">
-					<form srting="Wiki History">
-						<field name="summary" select="1" colspan="4"/>
-						<field name="text_area" select="1" colspan="4"/>
-						<field name="date_time" select="1"/>
-						<field name="minor_edit" select="1"/>
-						<field name="history_wiki_id"/>
-					</form>
-				</field>
-			</record>
+		<record model="ir.ui.view" id="wiki_group_tree">
+			<field name="name">wiki.groups.tree</field>
+			<field name="model">wiki.groups</field>
+			<field name="type">tree</field>
+			<field name="arch" type="xml">
+				<tree srting="Wiki Groups">
+					<field name="name"/>
+					<field name="create_date"/>
+				</tree>
+			</field>
+		</record>
+		
+		<record model="ir.ui.view" id="wiki_group_form">
+			<field name="name">wiki.groups.form</field>
+			<field name="model">wiki.groups</field>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<form srting="Wiki Groups">
+					<field name="name" select="1"/>
+					<field name="create_date" readonly="1"/>
+					<field name="notes" colspan="4"/>
+					<group col="2" colspan="2">
+                        <button colspan="2" name="%(wizard_group_menu_create)d" string="Create a Menu" type="action" target="new"/>
+                    </group>
+				</form>
+			</field>
+		</record>
 
-			<record model="ir.actions.act_window" id="action_history">
-				<field name="name">Wiki History</field>
-				<field name="res_model">wiki.wiki.history</field>
-				<field name="view_type">form</field>
-				<field name="view_mode">form,tree</field>
-				<field name="view_id" ref="wiki_history_form"/>
-			</record>
+		<record model="ir.actions.act_window" id="action_wiki_groups">
+			<field name="name">Wiki Groups</field>
+			<field name="res_model">wiki.groups</field>
+			<field name="view_type">form</field>
+			<field name="view_mode">form,tree</field>
+			<field name="view_id" ref="wiki_group_tree"/>
+		</record>
 
-			<menuitem name="Wiki System/History" id="menu_action_history" action="action_history"/>
+		<menuitem name="Document Management/Configuration/Groups" id="menu_action_wiki_groups" action="action_wiki_groups"/>
+		
+		<record model="ir.ui.view" id="view_wiki_tree">
+			<field name="name">wiki.wiki.tree</field>
+			<field name="model">wiki.wiki</field>
+			<field name="type">tree</field>
+			<field name="arch" type="xml">
+				<tree string="Wiki">
+					<field name="name"/>
+					<field name="create_uid" string="Authour"/>
+					<field name="create_date" string="Created on"/>
+				</tree>
+			</field>
+		</record>
 
-		</data>
-	</terp>
\ No newline at end of file
+		<record model="ir.ui.view" id="view_wiki_form">
+			<field name="name">wiki.wiki.form</field>
+			<field name="model">wiki.wiki</field>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<form string="Wiki">
+					<field name="name" search="1"/>
+					<field name="group_id" search="1"/>
+					<field name="write_date" readonly="1" search="1"/>
+					<field name="write_uid" readonly="1" search="1"/>
+					<separator string="Wiki Content" colspan="4"/>
+					<field name="text_area" nolabel="1" colspan="4" search="1" widget="text_wiki"/>
+					<separator string="Tags" colspan="4" />
+					<field name="tags" nolabel="1" colspan="4" search="1"/>
+					<field name="minor_edit" search="1" groups="base.group_extended"/>
+					<field name="summary" search="1" groups="base.group_extended"/>
+				</form>
+			</field>
+		</record>
+
+		<record model="ir.actions.act_window" id="action_wiki">
+			<field name="name">Wiki Pages</field>
+			<field name="res_model">wiki.wiki</field>
+			<field name="view_type">form</field>
+			<field name="view_mode">form,tree</field>
+			<field name="view_id" ref="view_wiki_tree"/>
+		</record>
+
+		<menuitem name="Document Management/Wiki Pages" id="menu_action_wiki_wiki" action="action_wiki"/>
+
+		<record model="ir.ui.view" id="view_wiki_history_tree">
+			<field name="name">wiki.wiki.history.tree</field>
+			<field name="model">wiki.wiki.history</field>
+			<field name="type">tree</field>
+			<field name="arch" type="xml">
+				<tree srting="Wiki History">
+					<field name="date_time"/>
+					<field name="text_area"/>
+					<field name="minor_edit"/>
+					<field name="summary"/>
+				</tree>
+			</field>
+		</record>
+		
+		<record model="ir.ui.view" id="wiki_history_form">
+			<field name="name">wiki.wiki.history.form</field>
+			<field name="model">wiki.wiki.history</field>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<form srting="Wiki History">
+					<field name="summary" select="1" colspan="4"/>
+					<field name="text_area" select="1" colspan="4"/>
+					<field name="date_time" select="1"/>
+					<field name="minor_edit" select="1"/>
+					<field name="history_wiki_id"/>
+				</form>
+			</field>
+		</record>
+
+		<record model="ir.actions.act_window" id="action_history">
+			<field name="name">Wiki History</field>
+			<field name="res_model">wiki.wiki.history</field>
+			<field name="view_type">form</field>
+			<field name="view_mode">form,tree</field>
+			<field name="view_id" ref="wiki_history_form"/>
+		</record>
+
+		<menuitem name="Document Management/History" id="menu_action_history" action="action_history"/>
+	
+	</data>
+</openerp>
\ No newline at end of file

From 22b79cca78747c3ca607f3505723ee00df8843a3 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Fri, 21 Nov 2008 20:48:48 +0530
Subject: [PATCH 3/6] adding action for history

bzr revid: mga@tinyerp.com-20081121151848-jap1gt00p97ju8s3
---
 addons/wiki/wiki_view.xml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index 477d6a4f670..e17f217a1c7 100755
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -68,10 +68,8 @@
 					<field name="group_id" search="1"/>
 					<field name="write_date" readonly="1" search="1"/>
 					<field name="write_uid" readonly="1" search="1"/>
-					<separator string="Wiki Content" colspan="4"/>
 					<field name="text_area" nolabel="1" colspan="4" search="1" widget="text_wiki"/>
-					<separator string="Tags" colspan="4" />
-					<field name="tags" nolabel="1" colspan="4" search="1"/>
+					<field name="tags" colspan="4" search="1"/>
 					<field name="minor_edit" search="1" groups="base.group_extended"/>
 					<field name="summary" search="1" groups="base.group_extended"/>
 				</form>
@@ -126,6 +124,10 @@
 		</record>
 
 		<menuitem name="Document Management/History" id="menu_action_history" action="action_history"/>
-	
+		
+		<act_window domain="[('history_wiki_id', '=', active_id)]"
+            id="act_wiki_wiki_History" name="History"
+            res_model="wiki.wiki.history"
+            src_model="wiki.wiki"/>
 	</data>
 </openerp>
\ No newline at end of file

From 7229aa92468a846743c9a0d8cd8c153f44d896b4 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Fri, 21 Nov 2008 20:58:51 +0530
Subject: [PATCH 4/6] improvement

bzr revid: mga@tinyerp.com-20081121152851-6vszyazrhkg4za0r
---
 addons/wiki/wiki_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index e17f217a1c7..25703d76cdb 100755
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -107,7 +107,7 @@
 			<field name="arch" type="xml">
 				<form srting="Wiki History">
 					<field name="summary" select="1" colspan="4"/>
-					<field name="text_area" select="1" colspan="4"/>
+					<field name="text_area" select="1" colspan="4" widget="text_wiki"/>
 					<field name="date_time" select="1"/>
 					<field name="minor_edit" select="1"/>
 					<field name="history_wiki_id"/>

From 07b496ed10534df1aa55a18b1e3ee0e89d5a48e8 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Fri, 21 Nov 2008 21:53:44 +0530
Subject: [PATCH 5/6] develope wizard to create a menu add groups

bzr revid: mga@tinyerp.com-20081121162344-lm93qh8f7ojnxey7
---
 addons/wiki/wizard/__init__.py    |  1 +
 addons/wiki/wizard/create_menu.py | 78 +++++++++++++++++++++++++++++++
 2 files changed, 79 insertions(+)
 create mode 100644 addons/wiki/wizard/__init__.py
 create mode 100644 addons/wiki/wizard/create_menu.py

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..5750b027829
--- /dev/null
+++ b/addons/wiki/wizard/create_menu.py
@@ -0,0 +1,78 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution    
+#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). 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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+
+import time
+import wizard
+import osv
+import pooler
+
+section_form = '''<?xml version="1.0"?>
+<form string="Create Menu">
+    <separator string="Menu Information" colspan="4"/>
+    <field name="menu_name"/>
+    <field name="menu_parent_id"/>
+</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','=',%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')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+

From 64fd574aa2899cef06aa8da3c8e8c4102339e57e Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Fri, 21 Nov 2008 21:54:47 +0530
Subject: [PATCH 6/6] improvement for the groups

bzr revid: mga@tinyerp.com-20081121162447-7zi0z55i1euoelwz
---
 addons/wiki/wiki.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/wiki/wiki.py b/addons/wiki/wiki.py
index bb26a8b1fb2..ea55056bb23 100755
--- a/addons/wiki/wiki.py
+++ b/addons/wiki/wiki.py
@@ -42,6 +42,7 @@ class WikiGroup(osv.osv):
     }
 WikiGroup()
 
+
 class Wiki(osv.osv):
     _name="wiki.wiki"
     _description="Wiki"