Merge lp:~julie-w/unifield-server/US-5171 into lp:unifield-server

Proposed by jftempo
Status: Merged
Merged at revision: 5101
Proposed branch: lp:~julie-w/unifield-server/US-5171
Merge into: lp:unifield-server
Diff against target: 22 lines (+2/-4)
1 file modified
bin/service/web_services.py (+2/-4)
To merge this branch: bzr merge lp:~julie-w/unifield-server/US-5171
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+356170@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'bin/service/web_services.py'
--- bin/service/web_services.py 2018-03-28 07:36:10 +0000
+++ bin/service/web_services.py 2018-10-05 09:12:31 +0000
@@ -953,16 +953,14 @@
953 self.id_protect.release()953 self.id_protect.release()
954 model_obj = pool.get(model)954 model_obj = pool.get(model)
955 view_name = context.get('_terp_view_name', '')955 view_name = context.get('_terp_view_name', '')
956 tools_obj = pool.get('date.tools')956 title = '%s_%s' % (view_name, time.strftime('%Y%m%d'))
957 time_stamp = time.strftime(tools_obj.get_datetime_format(cr, uid, context=context))
958 title = 'Export %s %s' % (view_name, time_stamp)
959 self._reports[report_id] = {957 self._reports[report_id] = {
960 'uid': uid,958 'uid': uid,
961 'result': False,959 'result': False,
962 'state': False,960 'state': False,
963 'exception': None,961 'exception': None,
964 'format': export_format,962 'format': export_format,
965 'filename': '%s_%s' % (view_name, time.strftime('%Y%m%d')),963 'filename': title,
966 }964 }
967965
968 bg_obj = pool.get('memory.background.report')966 bg_obj = pool.get('memory.background.report')

Subscribers

People subscribed via source and target branches