projects
/
app.Builder.js
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
resources/Editors/Editor.Roo.LayoutDialog.bjs
[app.Builder.js]
/
resources
/
Editors
/
Editor.Roo.LayoutDialog.js
diff --git
a/resources/Editors/Editor.Roo.LayoutDialog.js
b/resources/Editors/Editor.Roo.LayoutDialog.js
index
25ff494
..
d2629aa
100644
(file)
--- a/
resources/Editors/Editor.Roo.LayoutDialog.js
+++ b/
resources/Editors/Editor.Roo.LayoutDialog.js
@@
-533,20
+533,6
@@
Editor.Roo.LayoutDialog = new Roo.XComponent({
var r = data[k];
var has_s = typeof(r.relates_to_schema) != 'undefined';
var r = data[k];
var has_s = typeof(r.relates_to_schema) != 'undefined';
- var rt = '', rc = '', rs = [];
-
- if(has_s){
- for (var kk in r.relates_to_schema) {
- var rr = r.relates_to_schema[kk];
-
- rt = r.relates_to_table;
- rc = r.relates_to_col;
-
- rs.push([rr.Field]);
-
- }
- }
-
var field_type = 'TextField';
var regex = /(.*?)\((.*?)\)/;
var field_type = 'TextField';
var regex = /(.*?)\((.*?)\)/;
@@
-567,12
+553,33
@@
Editor.Roo.LayoutDialog = new Roo.XComponent({
}
}
- }
+ } esle {
+ switch r.Type {
+ case 'text' :
+ field_type = 'TextArea';
+ break;
+ case 'date' :
+ case 'datetime':
+ field_type = 'DateField';
+ }
- var type_match = regex.exec(r.Type);
+ }
-
Roo.log(type_match)
;
+
var rt = '', rc = '', rs = []
;
+ if(has_s){
+ for (var kk in r.relates_to_schema) {
+ var rr = r.relates_to_schema[kk];
+
+ rt = r.relates_to_table;
+ rc = r.relates_to_col;
+
+ rs.push([rr.Field]);
+
+ }
+
+ field_type = 'ComboBox';
+ }