diff --git a/addons/wiki/__terp__.py b/addons/wiki/__terp__.py index f78d78955d6..ca2fdf011e3 100644 --- a/addons/wiki/__terp__.py +++ b/addons/wiki/__terp__.py @@ -14,6 +14,7 @@ "demo_xml" : [], "update_xml" : [ "wiki_view.xml", + #"wiki_data.xml", "wizard/wizard_view.xml", "security/ir.model.access.csv" ], diff --git a/addons/wiki/wiki.py b/addons/wiki/wiki.py index 5e1ba1b7aa6..c12ecb6c4ec 100644 --- a/addons/wiki/wiki.py +++ b/addons/wiki/wiki.py @@ -59,7 +59,7 @@ class Wiki(osv.osv): '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'), + '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, select=True), 'section': fields.char('Section', size=32, help="Use page section code like 1.2.1"), @@ -85,7 +85,10 @@ class Wiki(osv.osv): 'section': section } } - + + def copy(self, cr, uid, id, default=None, context=None): + return super(Wiki, self).copy(cr, uid, id, {'wiki_id':False}, context) + def write(self, cr, uid, ids, vals, context=None): result = super(Wiki,self).write(cr, uid, ids, vals, context) history = self.pool.get('wiki.wiki.history') diff --git a/addons/wiki/wiki_data.xml b/addons/wiki/wiki_data.xml new file mode 100644 index 00000000000..8e3ce35339a --- /dev/null +++ b/addons/wiki/wiki_data.xml @@ -0,0 +1,112 @@ + + + + + + + + + + + + + + + + + + + + + + + + + See also : [[Complete Help]] + ===External=== + You can give link to the other Web page over the Internet easily [http://google.com Visit Google] + ==Attachments== + ===Images=== + You can get the External links easily
+ img:http://images.google.co.in/intl/en_ALL/images/images_hp.gif + + ==Headings== + =1st Level Heading= + ==2nd Level Heading== + ===3rd Level Heading=== + + ==Unnumbered List== + * ''Unordered lists'' are easy to do: + ** Start every line with a star. + *** More stars indicate a deeper level. + *: Previous item continues. + ** A new line + * in a list + marks the end of the list. + *Of course you can start again. + + ==Numbered List== + # ''Numbered lists'' are: + ## Very organized + ## Easy to follow + #: Previous item continues + A new line marks the end of the list. + # New numbering starts with 1 + + ==Text Indents== + : A colon (:) indents a line or paragraph. + A newline starts a new paragraph. + : We use 1 colon to indent once. + :: We use 2 colons to indent twice. + ::: 3 colons to indent 3 times, and so on. + + ==Table== + + {| border="1" cellspacing="0" cellpadding="5" align="left" + ! Web site + ! Link + ! Contact Email + |- + | '''Open ERP''' - ''Belgium'' + | [http://openerp.com] + | [[ mailto:fp@tinyerp.com ]] + |} + + {| border="1" cellspacing="0" cellpadding="5" align="left" + ! Web site + ! Link + ! Contact Email + |- + | '''Open ERP''' - ''Belgium'' + | [http://openerp.com] + | [[ mailto:fp@tinyerp.com ]] + |} +

]]> + + + + diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml index 197bb93bbda..9d8f63cfcd0 100644 --- a/addons/wiki/wiki_view.xml +++ b/addons/wiki/wiki_view.xml @@ -4,7 +4,7 @@ - + form tree,form + {'section':'1'} ). 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 = ''' +
+ +