Merge lp:~openerp-dev/openobject-addons/6.1-opw-573644-dhs into lp:openobject-addons/6.1

[Dhruti Shastri(OpenERP)]

Description :
Navigate to: Knowledge/Documents/Documents. Create new document and
set Directory = Document (static Directory) and save it. Edit it and change the Directory =
Admin Folder(Folder per resource) save it, It will throws following error.
Client Traceback (most recent call last):
  File "/home/vpa/workspace/6.1/web-6.1/addons/web/common/http.py", line
180, in dispatch
    response["result"] = method(controller, self, **self.params)
  File "/home/vpa/workspace/6.1/web-6.1/addons/web/controllers/main.py",
line 971, in save
    r = m.write([id], data, req.session.eval_context(req.context))
  File
"/home/vpa/workspace/6.1/web-6.1/addons/web/common/openerplib/main.py",
line 250, in proxy
    args, kw)
  File
"/home/vpa/workspace/6.1/web-6.1/addons/web/common/openerplib/main.py",
line 117, in proxy
    result = self.connector.send(self.service_name, method, *args)
  File "/home/vpa/workspace/6.1/web-6.1/addons/web/common/http.py", line
611, in send
    raise fault
Server Traceback (most recent call last):
  File "/home/vpa/workspace/6.1/web-6.1/addons/web/common/http.py", line
592, in send
    result = openerp.netsvc.dispatch_rpc(service_name, method, args)
  File "/home/vpa/workspace/6.1/sever-6.1/openerp/netsvc.py", line 360,
in dispatch_rpc
    result = ExportService.getService(service_name).dispatch(method,
params)
  File
"/home/vpa/workspace/6.1/sever-6.1/openerp/service/web_services.py",
line 586, in dispatch
    res = fn(db, uid, *params)
  File "/home/vpa/workspace/6.1/sever-6.1/openerp/osv/osv.py", line 167,
in execute_kw
    return self.execute(db, uid, obj, method, *args, **kw or {})
  File "/home/vpa/workspace/6.1/sever-6.1/openerp/osv/osv.py", line 121,
in wrapper
    return f(self, dbname, *args, **kwargs)
  File "/home/vpa/workspace/6.1/sever-6.1/openerp/osv/osv.py", line 176,
in execute
    res = self.execute_cr(cr, uid, obj, method, *args, **kw)
  File "/home/vpa/workspace/6.1/sever-6.1/openerp/osv/osv.py", line 164,
in execute_cr
    return getattr(object, method)(cr, uid, *args, **kw)
  File "/home/vpa/workspace/6.1/addons-6.1/document/document.py", line
241, in write
    res = fnode.move_to(cr, dnode or fnode.parent, vals.get('name',
fbro.name), fbro, dbro, True)
  File "/home/vpa/workspace/6.1/addons-6.1/document/nodes.py", line
1332, in move_to
    raise NotImplementedError('Cannot move files between dynamic
folders')
NotImplementedError: Cannot move files between dynamic folders

[Naresh(OpenERP) (nch-openerp)]

It will be good if you have try ...except block for the move_to call...i.e

- res = fnode.move_to(cr, dnode or fnode.parent, vals.get('name', fbro.name), fbro, dbro, True)
+ try :
+ res = fnode.move_to(cr, dnode or fnode.parent, vals.get('name', fbro.name), fbro, dbro, True)
+ except Exception, e:
+ raise orm.except_orm(_('Error'), str(e))
                 if isinstance(res, dict):
                     vals2 = vals.copy()
                     vals2.update(res)

Thanks,

review: Needs Fixing

[Naresh(OpenERP) (nch-openerp)]

Hello,

This bug was qualified as Not Reproducible on Trunk (means that architecture on trunk has changed and so this bug has no meaning anymore). If this Merge Proposal could not be merged in v6.1 at the release of v7.0, it will be closed.

Thanks,
Naresh Soni

Unmerged revisions

6834. By Dhruti Shastri(OpenERP) on 2012-06-07

[document] : Cannot save document After changing Directory from Static to Dyanmic (Case:573644)

=== modified file 'document/document.py'
--- document/document.py	2011-12-19 16:54:40 +0000
+++ document/document.py	2012-06-07 07:07:20 +0000
@@ -20,7 +20,7 @@
 ##############################################################################
 
 import base64
-from osv import osv, fields
+from osv import osv, fields, orm
 import os
 
 # from psycopg2 import Binary
@@ -186,7 +186,6 @@
                                                 context=context, count=False)
         if not ids:
             return 0 if count else []
-
         # Filter out documents that are in directories that the user is not allowed to read.
         # Must use pure SQL to avoid access rules exceptions (we want to remove the records,
         # not fail), and the records have been filtered in parent's search() anyway.
@@ -238,17 +237,21 @@
                         ids2.append(fbro.id)
                         continue
                 fnode = nctx.get_file_node(cr, fbro)
-                res = fnode.move_to(cr, dnode or fnode.parent, vals.get('name', fbro.name), fbro, dbro, True)
-                if isinstance(res, dict):
-                    vals2 = vals.copy()
-                    vals2.update(res)
-                    wid = res.get('id', fbro.id)
-                    result = super(document_file,self).write(cr,uid,wid,vals2,context=context)
-                    # TODO: how to handle/merge several results?
-                elif res == True:
-                    ids2.append(fbro.id)
-                elif res == False:
-                    pass
+                try :
+                    res = fnode.move_to(cr, dnode or fnode.parent, vals.get('name', fbro.name), fbro, dbro, True)
+                    if isinstance(res, dict):
+                        vals2 = vals.copy()
+                        vals2.update(res)
+                        wid = res.get('id', fbro.id)
+                        result = super(document_file,self).write(cr,uid,wid,vals2,context=context)
+                        # TODO: how to handle/merge several results?
+                    elif res == True:
+                        ids2.append(fbro.id)
+                    elif res == False:
+                        pass
+                except Exception, e:
+                     raise orm.except_orm(_('Error'), str(e))
+                     
             ids = ids2
         if 'file_size' in vals: # only write that field using direct SQL calls
             del vals['file_size']