瀏覽代碼

HUE-3091 [oozie] Do not remove extra new lines from email action body

krish 10 年之前
父節點
當前提交
2b18df6
共有 2 個文件被更改,包括 3 次插入2 次删除
  1. 2 2
      apps/oozie/src/oozie/models2.py
  2. 1 0
      apps/oozie/src/oozie/tests2.py

+ 2 - 2
apps/oozie/src/oozie/models2.py

@@ -192,7 +192,7 @@ class Workflow(Job):
     sub_wfs_ids = [node.data['properties']['workflow'] for node in nodes if node.data['type'] == 'subworkflow']
     workflow_mapping = dict([(workflow.uuid, Workflow(document=workflow)) for workflow in Document2.objects.filter(uuid__in=sub_wfs_ids)])
 
-    xml = re.sub(re.compile('\s*\n+', re.MULTILINE), '\n', django_mako.render_to_string(tmpl, {
+    xml = re.sub(re.compile('>\s*\n+', re.MULTILINE), '>\n', django_mako.render_to_string(tmpl, {
               'wf': self,
               'workflow': data['workflow'],
               'nodes': nodes,
@@ -200,7 +200,7 @@ class Workflow(Job):
               'node_mapping': node_mapping,
               'workflow_mapping': workflow_mapping
           }))
-    return force_unicode(xml)
+    return force_unicode(xml.strip())
 
   @property
   def name(self):

文件差異過大導致無法顯示
+ 1 - 0
apps/oozie/src/oozie/tests2.py


部分文件因文件數量過多而無法顯示