瀏覽代碼

Merge pull request #14392 from jakesmith/hpcc-25076-prevent-global-transopts

HPCC-25076 Prevent alwaysECL and alwaysDisk globally

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 4 年之前
父節點
當前提交
05186893cb
共有 1 個文件被更改,包括 4 次插入2 次删除
  1. 4 2
      thorlcr/thorutil/thormisc.cpp

+ 4 - 2
thorlcr/thorutil/thormisc.cpp

@@ -1470,11 +1470,13 @@ RecordTranslationMode getTranslationMode(CActivityBase &activity)
 {
     bool local = true;
     StringBuffer val;
-    activity.getOpt("layoutTranslation", val);
+    activity.queryContainer().queryXGMML().getProp("hint[@name=\"layouttranslation\"]/@value", val);
     if (!val.length())
     {
-        globals->getProp("@fieldTranslationEnabled", val);
         local = false;
+        activity.queryJob().getOpt("layoutTranslation", val);
+        if (!val.length())
+            globals->getProp("@fieldTranslationEnabled", val);
     }
     return getTranslationMode(val, local);
 }