From 2730077518a7cc269c60a30c287525b396fdb1be Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Fri, 17 Apr 2015 16:57:50 +0800 Subject: [PATCH] resources/Editors/Editor.Roo.grid.Grid.bjs resources/Editors/Editor.Roo.grid.Grid.js --- resources/Editors/Editor.Roo.grid.Grid.bjs | 2 +- resources/Editors/Editor.Roo.grid.Grid.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/Editors/Editor.Roo.grid.Grid.bjs b/resources/Editors/Editor.Roo.grid.Grid.bjs index eb5fb4a51..3d12f0a22 100644 --- a/resources/Editors/Editor.Roo.grid.Grid.bjs +++ b/resources/Editors/Editor.Roo.grid.Grid.bjs @@ -20,7 +20,7 @@ "listeners" : { "|activate" : "function() {\n _this.panel = this;\n if (_this.grid) {\n _this.grid.footer.onClick('first');\n }\n}" }, - "| function loadData" : "function(data) { \n\n alert(\"IPC:TEST:\" + JSON.stringify(data,null,4));\n var ar = [];\n for (var k in data) { \n var r = data[k];\n var has_s = typeof(r.relates_to_schema) != 'undefined'\n ar.push([ !has_s , r.Field, r.Type, r.Field, 100] );\n if (!has_s) {\n continue;\n }\n for (var kk in r.relates_to_schmea) { \n var rr = r.relates_to_schmea[kk];\n if (rr.Field == r.relates_to_col) {\n continue;\n }\n ar.push([ false, r.Field + '_'+ rr.Field, rr.Type, rr.Field, 100] );\n }\n }\n \n alert(\"IPC:TEST:\" + JSON.stringify(ar));\n this.grid.dataSource.loadData(ar);\n}", + "| function loadData" : "function(data) { \n\n alert(\"IPC:TEST:\" + JSON.stringify(data,null,4));\n var ar = [];\n for (var k in data) { \n var r = data[k];\n var has_s = typeof(r.relates_to_schema) != 'undefined'\n ar.push([ !has_s , r.Field, r.Type, r.Field, 100] );\n if (!has_s) {\n continue;\n }\n for (var kk in r.relates_to_schema) { \n var rr = r.relates_to_schema[kk];\n if (rr.Field == r.relates_to_col) {\n continue;\n }\n ar.push([ false, r.Field + '_'+ rr.Field, rr.Type, rr.Field, 100] );\n }\n }\n \n alert(\"IPC:TEST:\" + JSON.stringify(ar));\n this.grid.dataSource.loadData(ar);\n}", "fitToframe" : true, "background" : false, "region" : "center", diff --git a/resources/Editors/Editor.Roo.grid.Grid.js b/resources/Editors/Editor.Roo.grid.Grid.js index 95e0ccf55..fdf7f632b 100644 --- a/resources/Editors/Editor.Roo.grid.Grid.js +++ b/resources/Editors/Editor.Roo.grid.Grid.js @@ -199,8 +199,8 @@ Editor.Roo.grid.Grid = new Roo.XComponent({ if (!has_s) { continue; } - for (var kk in r.relates_to_schmea) { - var rr = r.relates_to_schmea[kk]; + for (var kk in r.relates_to_schema) { + var rr = r.relates_to_schema[kk]; if (rr.Field == r.relates_to_col) { continue; } -- 2.39.2