From 56b726f56df622bccc5d6895435b1984796dd7dd Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 9 Jul 2008 05:46:24 +0000
Subject: [PATCH] Access Rights

bzr revid: fp@tinyerp.com-b34833a003282214495c9c32bbd514ba5fdddaf0
---
 bin/addons/base/module/module_view.xml | 15 +++++----------
 bin/osv/orm.py                         | 11 +++++------
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/bin/addons/base/module/module_view.xml b/bin/addons/base/module/module_view.xml
index 368c0d2e512..367e51b3f20 100644
--- a/bin/addons/base/module/module_view.xml
+++ b/bin/addons/base/module/module_view.xml
@@ -226,16 +226,11 @@
             <field name="model">ir.module.module.configuration.wizard</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Next Configuration Step">
-                    <group colspan="4">
-                        <separator string="Next Configuration Step"/>
-                        <newline/>
-                        <field name="name" nolabel="1"/>
-                    </group>
+                <form string="Next Configuration Step" width="400">
+					<separator string="Next Configuration Step" colspan="4" width="400"/>
+					<newline/>
+					<field name="name" nolabel="1" colspan="4"/>
                     <separator colspan="4" string=""/>
-                    <newline/>
-                    <group colspan="2">
-                    </group>
                     <group colspan="2">
                         <button colspan="1" icon="gtk-cancel" special="cancel" string="Cancel"/>
                         <!--<button name="button_skip" type='object' string="Skip" icon="gtk-ok"/>-->
@@ -260,4 +255,4 @@
         
         
     </data>
-</terp>
\ No newline at end of file
+</terp>
diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 793588ca772..0bf3fb22cab 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -654,7 +654,7 @@ class orm_template(object):
 
 	# returns the definition of each field in the object
 	# the optional fields parameter can limit the result to some fields
-	def fields_get(self, cr, user, fields=None, context=None):
+	def fields_get(self, cr, user, fields=None, context=None, read_access=True):
 		if context is None:
 			context = {}
 		res = {}
@@ -663,8 +663,6 @@ class orm_template(object):
 		for parent in self._inherits:
 			res.update(self.pool.get(parent).fields_get(cr, user, fields,
 				context))
-		read_access= model_access_obj.check(cr, user, self._name, 'write',
-				raise_exception=False)
 		for f in self._columns.keys():
 			res[f] = {'type': self._columns[f]._type}
 			for arg in ('string', 'readonly', 'states', 'size', 'required',
@@ -1114,7 +1112,6 @@ class orm_memory(orm_template):
 		return True
 
 	def read(self, cr, user, ids, fields=None, context=None, load='_classic_read'):
-		self.pool.get('ir.model.access').check(cr, user, self._name, 'read')
 		if not fields:
 			fields = self._columns.keys()
 		result = []
@@ -1132,7 +1129,6 @@ class orm_memory(orm_template):
 		return result
 
 	def write(self, cr, user, ids, vals, context=None):
-		self.pool.get('ir.model.access').check(cr, user, self._name, 'write')
 		vals2 = {}
 		upd_todo = []
 		for field in vals:
@@ -1152,7 +1148,6 @@ class orm_memory(orm_template):
 		return id_new
 
 	def create(self, cr, user, vals, context=None):
-		self.pool.get('ir.model.access').check(cr, user, self._name, 'create')
 		self.next_id += 1
 		id_new = self.next_id
 		default = []
@@ -1624,6 +1619,10 @@ class orm(orm_template):
 		self._inherit_fields=res
 		self._inherits_reload_src()
 
+	def fields_get(self, cr, user, fields=None, context=None):
+		read_access= self.pool.get('ir.model.access').check(cr, user, self._name, 'write', raise_exception=False)
+		return super(orm, self).fields_get(cr, user, fields, context, read_access)
+
 	def read(self, cr, user, ids, fields=None, context=None, load='_classic_read'):
 		if not context:
 			context={}