odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP]: wiki: Apply changes in wizard 

bzr revid: ksa@tinyerp.co.in-20100412124147-kejx3dff80fxfjt8
This commit is contained in:
ksa (Open ERP) 2010-04-12 18:11:47 +05:30
parent 0a9e3631e2
commit 50cc43b94e
12 changed files with 138 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/wiki/__terp__.py
View File

@ -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',

1
addons/wiki/security/ir.model.access.csv
View File

@ -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

1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
8 wiki_wizard_wiki_history_show_diff wizard.wiki.history.show_diff model_wizard_wiki_history_show_diff base.group_user 1 1 1 1
9 wiki_wiki_page_open wiki.wiki.page.open model_wiki_wiki_page_open base.group_user 1 1 1 1
10 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
11 wiki_make_index wiki.make.index model_wiki_make_index base.group_user 1 1 1 1

105
addons/wiki/wiki.py
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', '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={}):

7
addons/wiki/wiki_view.xml
View File

@ -124,12 +124,15 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Wiki">
<group col="6" colspan="4">
<group col="8" colspan="4">
<field name="name" select="1" colspan="6"/>
<field name="group_id" select="1" on_change="onchange_group_id(group_id, text_area)"/>
<field name="section" select="2" invisible="not context.get('section',False)"/>
<field name="parent_id"/>
<button name="open_wiki_page" type="object"
string="Basic Wiki Editing" icon="gtk-ok" />
</group>
<field name="text_area" nolabel="1" colspan="4" select="1" widget="text_wiki"/>
<separator colspan="4" string="Modifications"/>
<group col="6" colspan="4">
@ -250,7 +253,7 @@
<field name="key2">tree_but_open</field>
<field name="model">wiki.groups</field>
<field name="name">Search a Page</field>
<field eval="'ir.actions.wizard,%d'%action_view_wiki_wiki_page_open" name="value"/>
<field eval="'ir.actions.wizard,%d'%action_view_wiki_wiki_page_open" name="value"/>
<field eval="True" name="object"/>
</record>

3
addons/wiki/wizard/__init__.py
View File

@ -21,8 +21,7 @@
import wiki_wiki_page_open
import wiki_create_menu
import wiki_wiki_help_open
import wiki_make_index
import show_diff
import wiki_show_diff
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

8
addons/wiki/wizard/wiki_make_index_view.xml
View File

@ -12,10 +12,12 @@
<form string="Create Menu">
<separator string="Menu Information" colspan="4"/>
<label string="Want to create a Index on Selected Pages ? "/>
<separator string="" colspan="4" />
<separator string="" colspan="6" />
<label string="" colspan="2" />
<button special="cancel" string="Cancel" />
<button name="wiki_do_index" string="Create Index" type="object"/>
<group>
<button special="cancel" string="Cancel" icon="gtk-cancel" />
<button name="wiki_do_index" string="Create Index" type="object" icon="gtk-ok"/>
</group>
</form>
</field>
</record>

10
addons/wiki/wizard/show_diff.py → addons/wiki/wizard/wiki_show_diff.py
View File

@ -27,14 +27,13 @@ class showdiff(osv.osv_memory):
_name = 'wizard.wiki.history.show_diff'
def _get_diff(self, cr, uid, ctx):
def get_diff(self, cr, uid, context=None):
""" @param cr: the current row, from the database cursor,
@param uid: the current user’s ID for security checks,
"""
history = self.pool.get('wiki.wiki.history')
ids = ctx.get('active_ids')
ids = context.get('active_ids')
diff = ""
if len(ids) == 2:
if ids[0] > ids[1]:
@ -49,14 +48,15 @@ class showdiff(osv.osv_memory):
diff = history.getDiff(cr, uid, ids[0], nids[-1])
else:
raise osv.except_osv(_('Warning'), _('You need to select minimum 1 or maximum 2 history revision!'))
return diff
_columns = {
'diff': fields.text('Diff'),
'diff': fields.text('Diff'),
}
_defaults = {
'diff': _get_diff
'diff': get_diff
}
showdiff()

42
addons/wiki/wizard/wiki_show_diff_view.xml Normal file
View File

@ -0,0 +1,42 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<!-- Create Index Form view -->
<record id="view_wiki_show_diff" model="ir.ui.view">
<field name="name">Show Difference</field>
<field name="model">wizard.wiki.history.show_diff</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Difference">
<separator colspan="4" string="Notes"/>
<field name="diff" nolabel="1" colspan="4" width="300"/>
<label string="" colspan="2" />
<group>
<button special="cancel" string="OK" icon="gtk-ok" />
</group>
</form>
</field>
</record>
<!-- Create Index Action -->
<record id="action_view_wiki_show_diff" model="ir.actions.act_window">
<field name="name">Difference</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">wizard.wiki.history.show_diff</field>
<field name="view_type">form</field>
<field name="view_mode">form</field>
<field name="target">new</field>
</record>
<!-- Create Index Action Window -->
<act_window id="action_view_wiki_show_diff_values"
key2="client_action_multi" name="Difference"
res_model="wizard.wiki.history.show_diff" src_model="wiki.wiki.history"
view_mode="form" target="new" view_type="form" />
</data>
</openerp>

55
addons/wiki/wizard/wiki_wiki_help_open.py
View File

@ -1,55 +0,0 @@
# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 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/>.
#
##############################################################################
from osv import fields, osv
class wiki_wiki_help_open(osv.osv_memory):
""" Basic Wiki Editing """
_name = "wiki.wiki.help.open"
_description = "Basic Wiki Editing"
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',
}
return value
wiki_wiki_help_open()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

38
addons/wiki/wizard/wiki_wiki_help_open_view.xml
View File

@ -1,38 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<!-- Editing Page Form view -->
<record id="view_wiki_wiki_help_open" model="ir.ui.view">
<field name="name">Basic Wiki Editing</field>
<field name="model">wiki.wiki.help.open</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Open Help">
<separator string="" colspan="6" />
<label string="" colspan="2" />
<button name="open_wiki_page" string="Basic Wiki Editing" type="object"/>
</form>
</field>
</record>
<!-- Editing Page Action -->
<record id="action_view_wiki_wiki_help_open" model="ir.actions.act_window">
<field name="name">Basic Wiki Editing</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">wiki.wiki.help.open</field>
<field name="view_type">form</field>
<field name="view_mode">form</field>
<field name="target">new</field>
</record>
<!-- Editing Page Action window -->
<act_window id="action_view_wiki_wiki_help_open_vals"
key2="client_action_multi" name="Basic Wiki Editing"
res_model="wiki.wiki.help.open" src_model="wiki.wiki"
view_mode="form" target="new" view_type="form" />
</data>
</openerp>

14
addons/wiki/wizard/wiki_wiki_page_open.py
View File

@ -38,13 +38,13 @@ class wiki_wiki_page_open(osv.osv_memory):
group_ids = context.get('active_ids', [])
for group in self.pool.get('wiki.groups').browse(cr, uid, group_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

9
addons/wiki/wizard/wiki_wiki_page_open_view.xml
View File

@ -11,8 +11,13 @@
<field name="arch" type="xml">
<form string="Open Page">
<separator string="" colspan="6" />
<label string="" colspan="2" />
<button name="open_wiki_page" string="Open Wiki Page" type="object"/>
<label string="Want to open a wiki page? "/>
<separator string="" colspan="6" />
<label string="" colspan="2" />
<group>
<button special="cancel" string="Cancel" icon="gtk-cancel" />
<button name="open_wiki_page" string="Open Wiki Page" type="object" icon="gtk-ok"/>
</group>
</form>
</field>
</record>