DataObjects/Builder_tables.php

[Pman.Builder] / Pman.Dialog.BuilderAddTable.js

diff --git a/Pman.Dialog.BuilderAddTable.js b/Pman.Dialog.BuilderAddTable.js
index 0c7ee78..eec49a3 100644 (file)
--- a/Pman.Dialog.BuilderAddTable.js
+++ b/Pman.Dialog.BuilderAddTable.js
@@ -241,7 +241,10 @@ Pman.Dialog.BuilderAddTable = {
                                 width : 150,
                                 renderer : function(v,x,r) { 
                                      
-                                    return String.format('{0}', v); 
+                                    var u = r.data.use * 1;
+                                     u += (r.data.use_ex*1);
+                                    
+                                    return String.format('{0}', u ? v : ''); 
                                 },
                                 editor : {
                                     xtype: 'GridEditor',
@@ -302,8 +305,10 @@ Pman.Dialog.BuilderAddTable = {
                              _this.grid.ds.each(function(r) {
                              
                                 if (r.data.use*1) {
-                                        ret.cols.title = r.data.title;
-                                        ret.cols.push(r.json);
+                                
+                                    var d = Roo.apply({}, r.json);
+                                    Roo.apply(d, r.data);
+                                    ret.cols.push(d);
                                         
                                 }
                                  if (r.data.use_ex*1) {
@@ -317,8 +322,10 @@ Pman.Dialog.BuilderAddTable = {
                                 return;
                             }
                              Roo.log(ret);
+                        
+                            _this.dialog.hide();
                              _this.callback(ret);
-                             _this.dialog.hide();
+                             
                         
                         }
                     },