Fix log grouping

Fix Copy Selection action
pydio · Jan 12, 2016 · 442b484 · 442b484
1 parent 7c7036b
commit 442b484
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/core/src/plugins/editor.ajxp_datagrid/class.AjxpDataGridEditor.js b/core/src/plugins/editor.ajxp_datagrid/class.AjxpDataGridEditor.js
@@ -93,17 +93,17 @@ Class.create("AjxpDataGridEditor", AbstractEditor, {
             var message = '';
             var first = nodes.first();
             var meta = first.getMetadata();
-            meta.each(function(pair){
-                if(exclude.indexOf(pair.key) == -1) {
-                    message += pair.key + '\t';
+            meta.forEach(function(value, key){
+                if(exclude.indexOf(key) == -1) {
+                    message += key + '\t';
                 }
             });
             message += '\n\n';
             nodes.each(function(node){
                 var meta = node.getMetadata();
-                meta.each(function(pair){
-                    if(exclude.indexOf(pair.key) == -1) {
-                        message += pair.value + '\t';
+                meta.forEach(function(value, key){
+                    if(exclude.indexOf(key) == -1) {
+                        message += value + '\t';
                     }
                 });
                 message += '\n';

diff --git a/core/src/plugins/log.sql/class.sqlLogDriver.php b/core/src/plugins/log.sql/class.sqlLogDriver.php
@@ -548,7 +548,7 @@ public function xmlLogs($parentDir, $date, $nodeName = "log", $rootPath = "/logs
             $currentCount = 1;
             foreach ($result as $r) {
 
-                if(isSet($buffer) && $buffer["user"] == $r["user"] && $buffer["message"] == $r["message"]){
+                if(isSet($buffer) && $buffer["user"] == $r["user"] && $buffer["message"] == $r["message"] && $buffer["params"] == $r["params"]){
                     $currentCount ++;
                     continue;
                 }