Merge pull request #638 from g-maxime/attachment

Do not apply policies to attachments

Author: JeromeMartinez

Source/Common/Reports.cpp

@@ -721,6 +721,9 @@ int Reports::create_report_ma_xml(int user, const std::vector<long>& files,
         if (core->checker_file_from_id(user, files[i], file, err) < 0)
             return -1;
 
+        if (file.rfind("attachment:", 0) == 0)
+            continue;
+
         xml_escape_attributes(file);
         report += "<media ref=\"" + file + "\">\n";
 

Source/Resource/html/js/checker/cellPolicy.js

@@ -37,18 +37,26 @@ var policyCell = (function() {
 
         // Update cell if analysis of file is succeeded
         if ($(result.cell('#result-' + fileId, 5).node()).hasClass('success')) {
-            if (policyId !== undefined && policyId !== "-1" && policyId !== -1) {
+            if (policyId !== undefined && policyId !== "-1" && policyId !== -1 && result.$('#result-' + fileId).data('attachment') !== "true") {
                 reset(fileId);
                 addSpinnerToCell(fileId);
 
                 checkerAjax.policyStatus(fileId, policyId);
             }
-            else {
+            else if (result.$('#result-' + fileId).data('attachment') == "true") {
+                empty(fileId)
+            } else {
                 emptyWithModal(fileId)
             }
         }
     };
 
+    var empty = function(fileId) {
+        var nodePolicy = $(result.cell('#result-' + fileId, 2).node());
+        nodePolicy.removeClass().addClass('info');
+        result.cell('#result-' + fileId, 2).data('<div><span class="policyResult">N/A</span></div>');
+    };
+
     var emptyWithModal = function(fileId) {
         var nodePolicy = $(result.cell('#result-' + fileId, 2).node());
         nodePolicy.removeClass().addClass('info');
@@ -191,6 +199,7 @@ var policyCell = (function() {
         success: success,
         error: error,
         update: update,
+        empty: empty,
         emptyWithModal: emptyWithModal,
         addSpinnerToCell: addSpinnerToCell,
         displayReport: displayReport,

Source/Resource/html/js/checker/table.js

@@ -111,6 +111,11 @@ var checkerTable = (function() {
         nodej.data('fileId', fileId);
 
         // Add policy, display and verbosity
+        if (fileName.startsWith("attachment:")) {
+            nodej.data('attachment', "true");
+        } else {
+            nodej.data('attachment', "false");
+        }
         nodej.data('policy', formValues.policy);
         nodej.data('policyName', formValues.policyText);
         nodej.data('display', formValues.display);
@@ -260,7 +265,7 @@ var checkerTable = (function() {
                 statusCell.success(statusFileId);
 
                 // Implementation and Policy
-                if (node.data('policy') != undefined && node.data('policy') !== "-1" && node.data('policy') !== -1) {
+                if (node.data('policy') != undefined && node.data('policy') !== "-1" && node.data('policy') !== -1 && node.data('attachment') !== "true") {
                     implementationCell.addSpinnerToCell(statusFileId);
                     policyCell.addSpinnerToCell(statusFileId);
 
@@ -272,7 +277,11 @@ var checkerTable = (function() {
 
                     reports.push({id: statusFileId, tool: status.tool});
 
-                    policyCell.emptyWithModal(statusFileId);
+                    if (node.data('attachment') !== "true") {
+                        policyCell.emptyWithModal(statusFileId);
+                    } else {
+                        policyCell.empty(statusFileId);
+                    }
                 }
 
                 // MediaInfo