summaryrefslogtreecommitdiff
path: root/addons/document_page
diff options
context:
space:
mode:
authorVidhin Mehta <vme@tinyerp.com>2013-08-23 10:36:02 +0530
committerVidhin Mehta <vme@tinyerp.com>2013-08-23 10:36:02 +0530
commit75ddd5ccbec73c4a671b6a74efaa3d41dc2ea2db (patch)
tree50ed3620df15e8533760f5d47e754a1d39c1e856 /addons/document_page
parent42f27a15275effd9c43dfe99e32c395ca6b3fd8a (diff)
parenta7f4b6aaa0359d12046e81183417c24f093cd7c3 (diff)
[MERGE]Trunk.
bzr revid: vme@tinyerp.com-20130823050602-33bqv07e7g8dhv7x
Diffstat (limited to 'addons/document_page')
-rw-r--r--addons/document_page/document_page.py2
-rw-r--r--addons/document_page/document_page_view.xml6
2 files changed, 6 insertions, 2 deletions
diff --git a/addons/document_page/document_page.py b/addons/document_page/document_page.py
index f74cfe02a21..7f885018001 100644
--- a/addons/document_page/document_page.py
+++ b/addons/document_page/document_page.py
@@ -66,7 +66,7 @@ class document_page(osv.osv):
'create_date': fields.datetime("Created on", select=True, readonly=True),
'create_uid': fields.many2one('res.users', 'Author', select=True, readonly=True),
'write_date': fields.datetime("Modification Date", select=True, readonly=True),
- 'write_uid': fields.many2one('res.users', "Last Contributor", select=True),
+ 'write_uid': fields.many2one('res.users', "Last Contributor", select=True, readonly=True),
}
_defaults = {
'type':'content',
diff --git a/addons/document_page/document_page_view.xml b/addons/document_page/document_page_view.xml
index 4d0b5596e75..9d02b47d265 100644
--- a/addons/document_page/document_page_view.xml
+++ b/addons/document_page/document_page_view.xml
@@ -88,7 +88,11 @@
<field name="view_mode">tree,form</field>
<field name="view_id" ref="view_wiki_tree"/>
<field name="search_view_id" ref="view_wiki_filter"/>
- <field name="help">Create web pages</field>
+ <field name="help" type="html">
+ <p class="oe_view_nocontent_create">
+ Click to create a new web page.
+ </p>
+ </field>
</record>
<menuitem id="menu_page" parent="menu_wiki" name="Pages" action="action_page" sequence="10"/>
<record id="action_category" model="ir.actions.act_window">