Browse Source

Merge pull request #5470 from GordonSmith/HPCC-10860

HPCC-10860 IsKeyFile is no longer valid

Reviewed-By: Miguel Vazquez <miguel.vazquez@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 11 years ago
parent
commit
1600e17a91

+ 2 - 2
esp/files/scripts/DFUQueryWidget.js

@@ -407,8 +407,8 @@ define([
                     },
                     IsKeyFile: {
                         label: "K", width: 16, sortable: false,
-                        formatter: function (keyfile) {
-                            if (keyfile == true) {
+                        formatter: function (keyfile, row) {
+                            if (row.ContentType === "key") {
                                 return "K";
                             }
                             return "";

+ 1 - 0
esp/files/scripts/nls/hpcc.js

@@ -47,6 +47,7 @@ define({root:
     Compress: "Compress",
     ConfirmPassword: "Confirm Password",
     Contents: "Contents",
+    ContentType: "Content Type",
     Copy: "Copy",
     Count: "Count",
     Created: "Created",

+ 4 - 0
esp/files/templates/LFDetailsWidget.html

@@ -89,6 +89,10 @@
                                 <div id="${id}JobName"></div>
                             </li>
                             <li>
+                                <label for="${id}Filesize">${i18n.ContentType}: </label>
+                                <div id="${id}ContentType"></div>
+                            </li>
+                            <li>
                                 <label for="${id}Filesize">${i18n.FileSize}: </label>
                                 <div id="${id}Filesize"></div>
                             </li>