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

[Holger Brunn (Therp)]

[Pedro Manuel Baeza (pedro.baeza)]

I think that the name would have an initial dot if there is no _recname, leading to incorrect file names or hidden files. Can it be?

I suggest to put:

if file_name:
    file_name = '%s.%s' % (file_name, report_struct['format'])
else:
    file_name = report_struct['format']

Regards.

review: Needs Information (code review)

[Holger Brunn (Therp) (hbrunn)]

No, the diff only shows the code that runs if there's enough information in the context to try to do something better. file_name is initialized with the report's name, so if the item_names test fails, you end up with the record's name (ie account.something.report)

[Holger Brunn (Therp) (hbrunn)]

[...] the report's name [...]

[Yann Papouin (yann-papouin)]

Ok

review: Approve (code review)

[Pedro Manuel Baeza (pedro.baeza)]

Thanks for the answer.

Regards.

review: Approve (code review)

[Pedro Manuel Baeza (pedro.baeza)]

One more thing. This MP should be converted to PR in the new OCB project on GitHub.

Regards.

[Holger Brunn (Therp) (hbrunn)]

https://github.com/OCA/OCB/pull/18

Thanks, I'm still confused which is the leading branch with the different projects

[Holger Brunn (Therp) (hbrunn)]

git, so I'm rejecting this one.

Unmerged revisions

4204. By Holger Brunn (Therp) on 2014-07-11

[FIX] calling name_get can cause tracebacks when printing reports
[IMP] only change name if we found a better one

=== modified file 'addons/web/controllers/main.py'
--- addons/web/controllers/main.py	2014-05-19 12:41:22 +0000
+++ addons/web/controllers/main.py	2014-07-11 16:34:22 +0000
@@ -1759,12 +1759,20 @@
                     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)
+                if item_names:
+                    file_name = '-'.join(item_names)
         file_name = '%s.%s' % (file_name, report_struct['format'])
         # Create safe filename
         p = re.compile('[/:(")<>|?*]|(\\\)')