[MERGE] merged from trunk-addons-development branch

bzr revid: hmo@tinyerp.com-20110222052739-jjyzcrqv0pr29qwq

3 files changed, 11 insertions, 9 deletions

diff --git a/addons/document/directory_report.py b/addons/document/directory_report.py
index 6eb18dae850..1665a7abf68 100644
--- a/addons/document/directory_report.py
+++ b/addons/document/directory_report.py
@@ -42,8 +42,12 @@ class ir_action_report_xml(osv.osv):
     def _model_search(self, cr, uid, obj, name, args, context=None):
         if not len(args):
             return []
+        assert len(args) == 1 and args[0][1] == '=', 'expression is not what we expect: %r' % args
         model_id= args[0][2]
         if not model_id:
+            # a deviation from standard behavior: when searching model_id = False
+            # we return *all* reports, not just ones with empty model.
+            # One reason is that 'model' is a required field so far
             return []
         model = self.pool.get('ir.model').read(cr, uid, [model_id])[0]['model']
         report_id = self.search(cr, uid, [('model','=',model)])
diff --git a/addons/document/nodes.py b/addons/document/nodes.py
index 1b7aebcd389..0c4194847c1 100644
--- a/addons/document/nodes.py
+++ b/addons/document/nodes.py
@@ -23,6 +23,7 @@
 import pooler
 from tools.safe_eval import safe_eval
 
+from tools.misc import ustr
 import errno
 # import os
 import time
@@ -808,7 +809,7 @@ class node_res_dir(node_class):
             return res[0]
         return None
 
-    def _child_get(self, cr, name = None, domain=None):
+    def _child_get(self, cr, name=None, domain=None):
         """ return virtual children of resource, based on the
             foreign object.
 
@@ -868,7 +869,7 @@ class node_res_dir(node_class):
             # Escape the name for characters not supported in filenames
             res_name = res_name.replace('/','_') # any other weird char?
             
-            if name and (res_name != name):
+            if name and (res_name != ustr(name)):
                 # we have matched _ to any character, but we only meant to match
                 # the special ones.
                 # Eg. 'a_c' will find 'abc', 'a/c', 'a_c', may only
@@ -1044,7 +1045,7 @@ class node_res_obj(node_class):
                 if not res_name:
                     continue
                 res_name = res_name.replace('/', '_')
-                if name and (res_name != name):
+                if name and (res_name != ustr(name)):
                     continue
                 # TODO Revise
                 klass = directory.get_node_class(directory, dynamic=True, context=ctx)
diff --git a/addons/document/security/ir.model.access.csv b/addons/document/security/ir.model.access.csv
index 0422edba24e..74befa56d41 100644
--- a/addons/document/security/ir.model.access.csv
+++ b/addons/document/security/ir.model.access.csv
@@ -2,10 +2,8 @@
 "access_document_directory_all","document.directory all","model_document_directory",,1,0,0,0
 "access_document_directory_group_document_manager","document.directory document manager","model_document_directory","base.group_system",1,1,1,1
 "access_document_directory_group_knowledge","document.directory modify","model_document_directory","base.group_document_user",1,1,1,1
-"access_document_directory_group_system","document.directory group system","model_document_directory","base.group_system",1,1,1,1
 "access_document_directory_content_all","document.directory.content all","model_document_directory_content",,1,0,0,0
 "access_document_directory_content_group_document_manager","document.directory.content document manager","model_document_directory_content","base.group_system",1,1,1,1
-"access_document_directory_content_group_system","document.directory.content group system","model_document_directory_content","base.group_system",1,1,1,1
 "access_document_directory_content_type_group_document_manager","document.directory.content.type document manager","model_document_directory_content_type","base.group_system",1,1,1,1
 "access_document_directory_content_type_group_system","document.directory.content.type group system","model_document_directory_content_type","base.group_user",1,0,0,0
 "access_document_storage_group_document_manager","document.storage document manager","model_document_storage","base.group_system",1,1,1,1
@@ -16,13 +14,12 @@
 "access_res_partner_group_user","res.partner user","base.model_res_partner","base.group_document_user",1,1,1,1
 "access_document_directory_dctx_all","document.directory.dctx all","model_document_directory_dctx",,1,0,0,0
 "access_document_directory_dctx_group_document_manager","document.directory.dctx document manager","model_document_directory_dctx","base.group_system",1,1,1,1
-"access_document_directory_dctx_group_system","document.directory.dctx group system","model_document_directory_dctx","base.group_system",1,1,1,1
 "access_report_document_user_group_document_manager","report.document.user document manager","model_report_document_user","base.group_system",1,0,0,0
-"access_report_document_user_group_system","report.document.user group system","model_report_document_user","base.group_system",1,0,0,0
 "access_report_files_partner_group_document_manager","report.files.partner document manager","model_report_files_partner","base.group_system",1,0,0,0
-"access_report_files_partner_group_system","report.files.partner group system","model_report_files_partner","base.group_system",1,0,0,0
 "access_report_document_file_group_document_manager","report.document.file document manager","model_report_document_file","base.group_system",1,0,0,0
-"access_report_document_file_group_system","report.document.file group system","model_report_document_file","base.group_system",1,0,0,0
 "access_report_document_wall_group_document_manager","report.document.wall document manager","model_report_document_wall","base.group_system",1,0,0,0
 "access_report_document_wall_group_system","report.document.wall group system","model_report_document_wall","base.group_system",1,0,0,0
+"access_report_files_partner_group_document","report.files.partner document manager","model_report_files_partner","base.group_document_user",1,0,0,0
+"access_report_document_file_group_document","report.document.file document manager","model_report_document_file","base.group_document_user",1,0,0,0
+"access_report_document_wall_group_document","report.document.wall document manager","model_report_document_wall","base.group_document_user",1,0,0,0
 "access_report_document_user_knowledgeuser","report.document.user knowledgeuser","document.model_report_document_user","base.group_document_user",1,0,0,0