Merge lp:~therp-nl/ocb-web/6.1_lp1340813 into lp:ocb-web/6.1

[Holger Brunn (Therp)]

[Pedro Manuel Baeza (pedro.baeza)]

LGTM

review: Approve (code review)

[Yann Papouin (yann-papouin)]

Ok

review: Approve (code review)

[Holger Brunn (Therp) (hbrunn)]

6.1 still lives on launchpad, so we can process with this one here.

[Pedro Manuel Baeza (pedro.baeza)]

OK, I think we can proceed with the merge due to the 2 approvals. May I?

Regards.

=== modified file 'addons/web/controllers/main.py'
--- addons/web/controllers/main.py	2014-01-08 13:14:56 +0000
+++ addons/web/controllers/main.py	2014-07-11 16:27:56 +0000
@@ -1871,15 +1871,24 @@
             if action_context.get('active_model') and action_context['active_ids']:
                 # Use built-in ORM method to get data from DB
                 m = req.session.model(action_context['active_model'])
-                r = m.name_get(action_context['active_ids'], context)
+                r = []
+                try:
+                    r = m.name_get(action_context['active_ids'], context)
+                except xmlrpclib.Fault:
+                    #we assume this went wrong because of incorrect/missing
+                    #_rec_name. We don't have access to _columns here to do
+                    # a proper check
+                    pass
                 # Parse result to create a better filename
                 item_names = [item[1] or str(item[0]) for item in r]
                 if action.get('name'):
                     item_names.insert(0, action['name'])
-                file_name = '-'.join(item_names)
-                # Create safe filename
-                p = re.compile('[/:(")<>|?*]|(\\\)')
-                file_name = p.sub('_', file_name)
+                #only change filename if we have something better
+                if item_names:
+                    file_name = '-'.join(item_names)
+                    # Create safe filename
+                    p = re.compile('[/:(")<>|?*]|(\\\)')
+                    file_name = p.sub('_', file_name)
 
         report = base64.b64decode(report_struct['result'])
         if report_struct.get('code') == 'zlib':