*fixed recursion, mostly

vikasaditya · Apr 10, 2012 · c61f68b · c61f68b
1 parent feffffa
commit c61f68b
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 15 deletions.
diff --git a/plugins/modeleditor/edit-display-model.js b/plugins/modeleditor/edit-display-model.js
@@ -41,28 +41,52 @@ var EditModel = function (k, Model, options) {
     this.title = this.model.title;
     this.plural = this.model.plural;
     this.editors = options.editors;
+    this.__defineGetter__('data', function(){
+        var obj = {};
+        _u(this.model.paths).each(function(v,k){
+           obj[k] = _u.extend({},v);
+           var sub = v.subSchema;
+           var cur = obj[k];
+           while(sub){
+               _u(sub).each(function(vv,kk){
+                   if (kk !== 'subSchema'){
+                       cur[kk] = vv;
+                   }
 
+               });
+
+               sub = sub.subSchema;
+
+           }
+        });
+
+        return obj;
+    });
     this.__defineGetter__('paths', function () {
         var paths = this.schema;
         return _u.map(this.schema, function (v, k) {
             paths[k].path = k;
         });
     })
+    this.__defineGetter__('fields', function(){
+        return Object.keys(util.flatten(this.model.paths))    ;
+    });
     this.__defineGetter__('fieldsets', function (v, k) {
         var fieldsets = [
             {
                 legend:'Edit ' + this.title,
                 fields:['title', 'plural', 'hidden', 'labelAttr', 'fieldsets', 'list_fields']
             }
         ];
-        _u(this.model.paths).each(function (v, k) {
+        _u(this.fields).each(function (k) {
             fieldsets.push({
-                legend:'Property [' + k + ']',
+                legend:this.title+'.' + k,
                 fields:['paths.' + k + '.title', 'paths.' + k + '.help', 'paths.' + k + '.views', 'paths.' + k + '.type', 'paths.' + k + '.dataType', 'paths.' + k + '.required']
             })
-        });
+        }, this);
         return fieldsets;
     })
+
 }
 EditModel.prototype.schema = {
     plural:{
@@ -86,7 +110,7 @@ EditModel.prototype.schema = {
     }
 };
 EditModel.prototype.schemaFor = function () {
-
+    var fields = this.fields;
     var schema = this._schema = _u.extend({}, this.schema);
     this._schema.fieldsets = {
         type:'List',
@@ -103,29 +127,26 @@ EditModel.prototype.schemaFor = function () {
             fields:{
                 title:'Fields to be used in this fieldset',
                 type:'MultiEditor',
-                options:Object.keys(this.model.paths)
+                options:fields
             }
         }
 
     }
     this._schema.list_fields = {
         type:'List',
         listType:'Select',
-        options:Object.keys(this.model.paths),
+        options:fields,
         help:'Fields to Show in the List View',
         title:'List View',
         sortable:true
     }
 
     var obj = (this._schema.paths = { subSchema:{}, type:'Object'}).subSchema;
-    var editors = this.editors;
     _u(this.model.paths).each(function (v, k) {
-//        if (k.indexOf('.') > -1)
-//            return;
-        console.log('k', k, 'v', v);
         obj[k] = {type:'Object'};
         obj[k].subSchema =createSubSchema(this.editors, k, v);
 
+
     }, this);
 
     return this._schema;
@@ -171,7 +192,11 @@ function createSubSchema(editors, k, v) {
             type:'Checkbox'
         }
     }
-
+    if (v.subSchema){
+        _u(v.subSchema).each(function(vv,kk){
+            obj[kk] = {type:'Object', subSchema:createSubSchema(editors, kk, vv)};
+        });
+    }
     return obj;
 }
 var EditField = function (Field) {

diff --git a/plugins/modeleditor/modeleditor.js b/plugins/modeleditor/modeleditor.js
@@ -57,7 +57,7 @@ EditPlugin.prototype.routes = function () {
 
     this.app.get(base + '/admin/model/:modelName', function (req, res) {
         var editModel = res.local('editModel');
-        var model = _u.extend({},  editModel.modelPaths[req.params.modelName].model);
+        var model = _u.extend({},  editModel.modelPaths[req.params.modelName].data);
         delete model._paths;
         res.send({
             status:0,

diff --git a/plugins/modeleditor/views/admin/edit.js b/plugins/modeleditor/views/admin/edit.js
@@ -9,8 +9,8 @@ define([
 ], function (_,Backbone, EditView, template) {
     "use strict";
 
-    var fieldsets = {{html JSON.stringify(model.fieldsets) }};
-    var schema = {{html JSON.stringify(model.schemaFor()) }};
+    var fieldsets = eval('({{html JSON.stringify(model.fieldsets) }})');
+    var schema = eval('({{html JSON.stringify(model.schemaFor()) }})');
     schema.fieldsets.itemToString = function(obj){
         var fields = '['+obj.fields.join(',')+']';
         if (fields.length > 30)
@@ -37,7 +37,6 @@ define([
             }
             return Backbone.Model.prototype.get.call(this, key);
         }
-
     });
     return EditView.extend({
         fieldsets:fieldsets,