fastui 0.1.3 → 0.1.4

data/app/assets/javascripts/fastui/app/view/VTreeGrid.js

@@ -1,6 +1,6 @@
 Ext.define('FastUI.view.VTreeGrid', {
     extend: 'Ext.tree.Panel',
-    requires: ['FastUI.store.MListMgr'],
+    requires: ['FastUI.store.MListMgr', 'FastUI.view.DataFieldFactory', 'FastUI.view.GridColumnFactory'],
     collapsible: true,
     useArrows: true,
     rootVisible: false,
@@ -17,8 +17,8 @@ Ext.define('FastUI.view.VTreeGrid', {
         itemclick:function (view, record, item, index, e, eOpts) {
             this.tab.winCtx.setWinCtx(this.tab.winId, this.tab.rest.getKey(), record.get('id'));
             this.tab.winCtx.setWinCtx(this.tab.winId, this.tab.rest.getTitle(), record.get('title'));
-            if (record.get('m_entity_id')) {
-                this.tab.winCtx.setWinCtx(this.tab.winId, 'm_entity_id', record.get('m_entity_id'));
+            if (record.get('entity')) {
+                this.tab.winCtx.setWinCtx(this.tab.winId, 'entity', record.get('entity'));
             }
             this.tab.getBtn('edit').enable();
             this.tab.getBtn('del').enable();
@@ -39,6 +39,7 @@ Ext.define('FastUI.view.VTreeGrid', {
     getTreeGStore: function () {
         return new Ext.data.TreeStore({
             autoLoad: true,
+            //autoSync: true,
             proxy:{
                 type: 'ajax',
                 url: this.tab.rest.indexPath(),
@@ -50,7 +51,8 @@ Ext.define('FastUI.view.VTreeGrid', {
                 }
             },
             root: {
-                name:'Root',
+                text:'Root',
+                id:'',
                 expanded: true
             },
             fields: this.getTreeGFields()
@@ -62,93 +64,14 @@ Ext.define('FastUI.view.VTreeGrid', {
     getTreeGFields: function () {
         var fields = [];
         Ext.each(this.getMColumns(), function (column) {
-            var field = {
-                name: column.name,
-                type: 'auto'
-            };
-            switch (column.datatype) {
-                case 'VLookup':
-                    var entity = {
-                        name: column.name.replace('_id', ''),
-                        type: 'auto'
-                    };
-                    fields.push(entity);
-            }
-            fields.push(field);
+            FastUI.view.DataFieldFactory.buildField(fields,column);
         }, this);
         return fields;
     },
     getTreeGColumns: function () {
         var columns = [];
         Ext.each(this.getMColumns(), function (column) {
-            switch (column.datatype) {
-                case 'VTree':
-                    columns.push({
-                        text: column.title,
-                        xtype: 'treecolumn',
-                        flex: 2.5,
-                        dataIndex: column.name
-                    });
-                    break;
-
-                case 'VLookup':
-                    var entity = column.name.replace('_id', '');
-                    columns.push({
-                        text: column.title,
-                        xtype: 'templatecolumn',
-                        dataIndex: column.name,
-                        tpl: new Ext.XTemplate(
-                        '<tpl for="' + entity + '">',
-                        '{title}',
-                        '</tpl>'
-                        )
-                    });
-                    break;
-
-                case 'VSingleChoice':
-                    var list_store = FastUI.store.MListMgr.getStore(column.name);
-                    columns.push({
-                        text: column.title,
-                        dataIndex: column.name,
-                        renderer: function (val) {
-                        var index = list_store.findExact('name', val);
-                        if (index > -1) {
-                            var rs = list_store.getAt(index).data;
-                            return rs.title;
-                        }
-                        return "";
-                        }
-                    });
-                    break;
-
-                case 'VSexSelect':
-                    columns.push({
-                        text: column.title,
-                        dataIndex: column.name,
-                        renderer: function (val) {
-                        return val ? '男' : '女'
-                        }
-                    });
-                    break;
-
-                case 'VYesOrNo':
-                    columns.push({
-                        text: column.title,
-                        dataIndex: column.name,
-                        renderer: function (val) {
-                        return val ? '是' : '否';
-                        }
-                    });
-                    break;
-
-                default:
-                    columns.push({
-                        text: column.title,
-                        dataIndex: column.name
-                    });
-                    break;
-            }
-
+            FastUI.view.GridColumnFactory.buildColumn(columns,column);
         }, this);
         return columns;
     }

data/app/assets/javascripts/fastui/app/view/vfield/{VBool.js → VBoolean.js}

@@ -1,4 +1,4 @@
-Ext.define('FastUI.view.vfield.VBool',{
+Ext.define('FastUI.view.vfield.VBoolean',{
     extend: 'Ext.form.field.Checkbox',
     valueObject: {},
     winCtx:{},

data/app/assets/javascripts/fastui/app/view/vfield/VFieldFactory.js

@@ -23,9 +23,10 @@ Ext.define('FastUI.view.vfield.VFieldFactory', {
 
     buildField: function (field, winCtx, winId, rest) {
         field.datatype = field.datatype || '';
+        //field.rest = rest;
         switch (field.datatype) {
-            case 'VText':
-                return Ext.create('FastUI.view.vfield.VText', {valueObject: field, winCtx: winCtx, winId: winId, rest: rest});
+            case 'VString':
+                return Ext.create('FastUI.view.vfield.VString', {valueObject: field, winCtx: winCtx, winId: winId, rest: rest});
 
             case 'VTree':
                 return Ext.create('FastUI.view.vfield.VTree', {valueObject: field, winCtx: winCtx, winId: winId, rest: rest});
@@ -33,8 +34,8 @@ Ext.define('FastUI.view.vfield.VFieldFactory', {
             case 'VDate':
                 return Ext.create('FastUI.view.vfield.VDate', {valueObject: field, winCtx: winCtx, winId: winId, rest: rest});
 
-            case 'VHtmlEditor':
-                return Ext.create('FastUI.view.vfield.VHtmlEditor', {valueObject: field, winCtx: winCtx, winId: winId, rest: rest});
+            case 'VHtml':
+                return Ext.create('FastUI.view.vfield.VHtml', {valueObject: field, winCtx: winCtx, winId: winId, rest: rest});
 
             case 'VSingleChoice':
                 return Ext.create('FastUI.view.vfield.VSingleChoice', {valueObject: field, winCtx: winCtx, winId: winId, rest: rest});
@@ -45,14 +46,17 @@ Ext.define('FastUI.view.vfield.VFieldFactory', {
             case 'VRadio':
                 return Ext.create('FastUI.view.vfield.VRadio', {valueObject: field, winCtx: winCtx, winId: winId, rest: rest});
 
-            case 'VTextArea':
-                return Ext.create('FastUI.view.vfield.VTextArea', {valueObject: field, winCtx: winCtx, winId: winId, rest: rest});
+            case 'VText':
+                return Ext.create('FastUI.view.vfield.VText', {valueObject: field, winCtx: winCtx, winId: winId, rest: rest});
 
             case 'VNumber':
                 return Ext.create('FastUI.view.vfield.VNumber', {valueObject: field, winCtx: winCtx, winId: winId, rest: rest});
 
-            case 'VBool':
-                return Ext.create('FastUI.view.vfield.VBool', {valueObject: field, winCtx: winCtx, winId: winId, rest: rest});
+            case 'VInteger':
+                return Ext.create('FastUI.view.vfield.VInteger', {valueObject: field, winCtx: winCtx, winId: winId, rest: rest});
+
+            case 'VBoolean':
+                return Ext.create('FastUI.view.vfield.VBoolean', {valueObject: field, winCtx: winCtx, winId: winId, rest: rest});
 
             case 'VCheckbox':
                 return Ext.create('FastUI.view.vfield.VCheckbox', {valueObject: field, winCtx: winCtx, winId: winId, rest: rest});
@@ -67,11 +71,17 @@ Ext.define('FastUI.view.vfield.VFieldFactory', {
                 return Ext.create('FastUI.view.vfield.VYesOrNo', {valueObject: field, winCtx: winCtx, winId: winId, rest: rest});
 
             case 'VList':
-                return Ext.create('FastUI.view.vfield.VCombobox', {valueObject: field, winCtx: winCtx, winId: winId, rest: rest});
+                return Ext.create('FastUI.view.vfield.VList', {valueObject: field, winCtx: winCtx, winId: winId, rest: rest});
 
             case 'VLookup':
                 return Ext.create('FastUI.view.vfield.VLookup', {valueObject: field, winCtx: winCtx, winId: winId, rest: rest});
 
+            case 'VTable':
+                return Ext.create('FastUI.view.vfield.VTable', {valueObject: field, winCtx: winCtx, winId: winId, rest: rest});
+
+            case 'VTreeCombobox':
+                return Ext.create('FastUI.view.vfield.VTreeCombobox', {valueObject: field, winCtx: winCtx, winId: winId, rest: rest});
+
             case 'VGroup':
                 var box = Ext.create('Ext.form.FieldSet',{
                     title: field.title,

data/app/assets/javascripts/fastui/app/view/vfield/{VHtmlEditor.js → VHtml.js}

@@ -1,4 +1,4 @@
-Ext.define('FastUI.view.vfield.VHtmlEditor',{
+Ext.define('FastUI.view.vfield.VHtml',{
     extend: 'Ext.form.field.HtmlEditor',
 
     valueObject: {},
@@ -12,6 +12,7 @@ Ext.define('FastUI.view.vfield.VHtmlEditor',{
         this.name =  this.rest.getTableName() + '[' + this.getFValue('name') + ']';
         this.disabled = this.getFValue('readonly');
         this.allowBlank = true;
+        this.vtype = this.getFValue('vtype');
         this.callParent();
     },
     getFValue:function (key) {

data/app/assets/javascripts/fastui/app/view/vfield/VInteger.js

@@ -0,0 +1,20 @@
+Ext.define('FastUI.view.vfield.VInteger',{
+    extend: 'Ext.form.field.Number',
+    valueObject: {},
+    winCtx:{},
+    winId:0,
+    rest:{},
+
+    allowDecimals: false,
+    initComponent:function(){
+        this.fieldLabel = this.getFValue('title');
+        this.name =  this.rest.getTableName() + '[' + this.getFValue('name') + ']';
+        this.disabled = this.getFValue('readonly');
+        this.allowBlank = true;
+        this.vtype = this.getFValue('vtype');
+        this.callParent();
+    },
+    getFValue:function (key) {
+        return this.valueObject[key];
+    }
+});

data/app/assets/javascripts/fastui/app/view/vfield/VList.js

@@ -0,0 +1,35 @@
+Ext.define('FastUI.view.vfield.VList', {
+    extend:'Ext.form.field.ComboBox',
+    requires:['FastUI.store.MListMgr'],
+    valueObject: {},
+    winCtx:{},
+    winId:0,
+    rest:{},
+
+    valueField:'name',
+    displayField:"title",
+    forceSelection:true,
+    triggerAction:'all',
+    editable:false,
+    selectOnFocus:true,
+
+    initComponent:function () {
+        this.fieldLabel = this.getFValue('title');
+        this.name =  this.rest.getTableName() + '[' + this.getFValue('name') + ']';
+        this.disabled = this.getFValue('readonly');
+        this.allowBlank = true;
+        this.store = FastUI.store.MListMgr.getStore(this.getFValue('name'));
+        this.callParent();
+    },
+    getFValue:function (key) {
+        return this.valueObject[key];
+    },
+    setValue:function (value) {
+        if(value && value.name && value.title){
+            this.setValue(value.name);
+        }else{
+            this.callParent(arguments);
+        }
+    }
+
+});

data/app/assets/javascripts/fastui/app/view/vfield/VLookup.js

@@ -1,6 +1,6 @@
 Ext.define('FastUI.view.vfield.VLookup', {
     extend:'Ext.form.field.ComboBox',
-    alias:'widget.vlookupwindow',
+    alias:'widget.vlookup',
     valueObject: {},
     winCtx:{},
     winId:0,
@@ -40,7 +40,7 @@ Ext.define('FastUI.view.vfield.VLookup', {
         this.loadWindow();
     },
     loadWindow:function () {
-        this.window = Ext.create('FastUI.view.VSearchWindow',{vlookup:this});
+        this.window = Ext.create('FastUI.view.VSearchWindow',{lookup:this});
         this.window.show();
     }
 });

data/app/assets/javascripts/fastui/app/view/vfield/VNumber.js

@@ -10,6 +10,7 @@ Ext.define('FastUI.view.vfield.VNumber',{
         this.name =  this.rest.getTableName() + '[' + this.getFValue('name') + ']';
         this.disabled = this.getFValue('readonly');
         this.allowBlank = true;
+        this.vtype = this.getFValue('vtype');
         this.callParent();
     },
     getFValue:function (key) {

data/app/assets/javascripts/fastui/app/view/vfield/{VTextArea.js → VString.js}

@@ -1,16 +1,15 @@
-Ext.define('FastUI.view.vfield.VTextArea',{
-    extend: 'Ext.form.field.TextArea',
-
+Ext.define('FastUI.view.vfield.VString',{
+    extend: 'Ext.form.field.Text',
     valueObject: {},
     winCtx:{},
     winId:0,
     rest:{},
-
     initComponent:function(){
         this.fieldLabel = this.getFValue('title');
         this.name =  this.rest.getTableName() + '[' + this.getFValue('name') + ']';
         this.disabled = this.getFValue('readonly');
         this.allowBlank = true;
+        this.vtype = this.getFValue('vtype');
         this.callParent();
     },
     getFValue:function (key) {

data/app/assets/javascripts/fastui/app/view/vfield/VTable.js

@@ -0,0 +1,50 @@
+Ext.define('FastUI.view.vfield.VTable', {
+    extend:'Ext.form.field.ComboBox',
+    requires:['FastUI.store.MListMgr'],
+    valueObject: {},
+    winCtx:{},
+    winId:0,
+    rest:{},
+
+    valueField:'id',
+    displayField:"title",
+    forceSelection:true,
+    triggerAction:'all',
+    editable:false,
+    selectOnFocus:true,
+
+    initComponent:function () {
+        this.fieldLabel = this.getFValue('title');
+        this.name =  this.rest.getTableName() + '[' + this.getFValue('name') + ']';
+        this.disabled = this.getFValue('readonly');
+        this.allowBlank = true;
+        this.store = this.getStore();
+        this.callParent();
+    },
+
+    getFValue:function (key) {
+        return this.valueObject[key];
+    },
+
+    getMEntity:function(){
+        return this.valueObject.ref.entity;
+    },
+
+    getStore:function () {
+        var rest = Ext.create('FastUI.view.Rest', this.getMEntity());
+        return new Ext.data.JsonStore({
+            autoLoad: true,
+            fields:['id', 'title'],
+            proxy:{
+                type:'ajax',
+                url:rest.indexPath(),
+                reader:{
+                    type:'json',
+                    root:'rows',
+                    totalProperty:"totalCount"
+                }
+            }
+        });
+    }
+
+});

data/app/assets/javascripts/fastui/app/view/vfield/VText.js

@@ -1,14 +1,17 @@
 Ext.define('FastUI.view.vfield.VText',{
-    extend: 'Ext.form.field.Text',
+    extend: 'Ext.form.field.TextArea',
+
     valueObject: {},
     winCtx:{},
     winId:0,
     rest:{},
+
     initComponent:function(){
         this.fieldLabel = this.getFValue('title');
         this.name =  this.rest.getTableName() + '[' + this.getFValue('name') + ']';
         this.disabled = this.getFValue('readonly');
         this.allowBlank = true;
+        this.vtype = this.getFValue('vtype');
         this.callParent();
     },
     getFValue:function (key) {

data/app/assets/javascripts/fastui/app/view/vfield/VTreeCombobox.js

@@ -0,0 +1,78 @@
+Ext.define('FastUI.view.vfield.VTreeCombobox', {
+    extend:'Ext.form.field.ComboBox',
+    alias:'widget.vtreecombobox',
+    valueObject: {},
+    winCtx:{},
+    winId:0,
+    rest:{},
+
+    editable: false,
+//    queryMode: 'local',
+//    select: Ext.emptyFn,
+    displayField:'title',
+    valueField:'id',
+    initComponent:function () {
+        this.fieldLabel = this.getFValue('title');
+        this.name =  this.rest.getTableName() + '[' + this.getFValue('name') + ']';
+        this.disabled = this.getFValue('readonly');
+        this.allowBlank = true;
+        this.store = Ext.create('Ext.data.ArrayStore', {
+            fields:['id', 'title'],
+            data:[]
+        });
+        this.callParent();
+    },
+    createPicker: function() {
+        var rest = Ext.create('FastUI.view.Rest', this.getMEntity());
+        return Ext.create('Ext.tree.Panel', {
+            hidden: true,
+            floating: true,
+            minHeight: 300,
+            autoScroll: true,
+            store: Ext.create('Ext.data.TreeStore', {
+                fields:['id', {name:'text', mapping:'title'}],
+                autoLoad: true,
+                proxy:{
+                    type: 'ajax',
+                    url: rest.indexPath(),
+                    reader:{
+                        type:'json',
+                        root:'',
+                        record:''
+                        //successProperty:''
+                    }
+                },
+                root: {
+                    text:'Root',
+                    id:'',
+                    expanded: true
+                }
+            }),
+            listeners: {
+                itemclick: function (view, record) {
+                    var id = record.get('id');
+                    if (!this.store.getById(id)){
+                        this.store.add({id:id,title:record.get('text')});
+                    }
+                    this.setValue(id);
+                    this.collapse();
+                },
+                scope:this
+            }
+        });
+    },
+    getMEntity:function(){
+        return this.valueObject.ref.entity;
+    },
+    getFValue:function (key) {
+        return this.valueObject[key];
+    },
+    setValue:function(value){
+        if(value && value.id && value.title){
+            this.store.add(value);
+            this.setValue(value.id);
+        }else{
+            this.callParent(arguments);
+        }
+    }
+});

data/app/assets/javascripts/fastui/app/view/vfield/VType.js

@@ -1,7 +1,85 @@
-Ext.apply(Ext.form.field.VTypes,{
-  uniquename: function (v) {
-        return Ext.form.field.VTypes.uniquenameRegex.test(v);
+Ext.apply(Ext.form.field.VTypes, {
+    passwd: function (val, field) {
+        if (field.initialPassField) {
+            var pwd = Ext.getCmp(field.initialPassField);
+            return (val == pwd.getValue());
+        }
+        return true;
     },
-    uniquenameRegex: /^[a-z]{1}[a-z_0-9]*$/,
-    uniquenameText: 'Invalid unique name'
+    passwdText: '两次输入的密码不一致！',
+
+    chinese: function (val, field) {
+        return (/^[\u4e00-\u9fa5]+$/i).test(val);
+    },
+    chineseText: '请输入中文',
+
+    age: function (val, field) {
+        return parseInt(val) >= 0 && parseInt(val) <= 150;
+    },
+    ageText: '年龄输入有误',
+
+    alphanum: function (val, field) {
+        return !(/\W/.test(val));
+    },
+    alphanumText: '请输入英文字母或是数字,其它字符是不允许的.',
+
+    url: function (val, field) {
+        return /^(http|https|ftp):\/\/(([A-Z0-9][A-Z0-9_-]*)(\.[A-Z0-9][A-Z0-9_-]*)+)(:(\d+))?\/?/i.test(val);
+    },
+    urlText: '请输入有效的URL地址.',
+
+    max: function (val, field) {
+        return parseFloat(val) <= parseFloat(field.max);
+    },
+    maxText: '超过最大值',
+
+    min: function (val, field) {
+        return parseFloat(val) >= parseFloat(field.min);
+    },
+    minText: '小于最小值',
+
+    datecn: function (val, field) {
+        return (/^(\d{4})-(\d{2})-(\d{2})$/.test(val));
+    },
+    datecnText: '请使用这样的日期格式: yyyy-mm-dd. 例如:2008-06-20.',
+
+    integer: function (val, field) {
+        return /^[-+]?[\d]+$/.test(val);
+    },
+    integerText: '请输入正确的整数',
+
+    minlength: function (val, field) {
+        return val.length >= parseInt(field.minlen);
+    },
+    minlengthText: '长度过小',
+
+    maxlength: function (val, field) {
+        return val.length <= parseInt(field.maxlen);
+    },
+    maxlengthText: '长度过大',
+
+    ip: function (val, field) {
+        return /^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/.test(val);
+    },
+    ipText: '请输入正确的IP地址',
+
+    phone: function (val, field) {
+        return /^((0[1-9]{3})?(0[12][0-9])?[-])?\d{6,8}$/.test(val);
+    },
+    phoneText: '请输入正确的电话号码,如:0920-29392929',
+
+    mobilephone: function (val, field) {
+        return /(^0?[1][35][0-9]{9}$)/.test(val);
+    },
+    mobilephoneText: '请输入正确的手机号码',
+
+    alpha: function (val, field) {
+        return /^[a-zA-Z]+$/.test(val);
+    },
+    alphaText: '请输入英文字母',
+
+    money: function (val, field) {
+        return /^\d+\.\d{2}$/.test(val);
+    },
+    moneyText: '请输入正确的金额'
 });

data/app/assets/javascripts/fastui/application.js

@@ -11,6 +11,7 @@
 // GO AFTER THE REQUIRES BELOW.
 //
 // require ./extjs4/ext-all
+//= require ./app/view/vfield/VType
 //= require ./extjs4/locale/ext-lang-zh_CN
 //= require ./app/inflection
 //= require ./fastui

data/app/assets/javascripts/fastui/extjs4/locale/ext-lang-zh_CN.js

@@ -1,31 +1,4 @@
-/*
-This file is part of Ext JS 4.2
 
-Copyright (c) 2011-2013 Sencha Inc
-
-Contact:  http://www.sencha.com/contact
-
-GNU General Public License Usage
-This file may be used under the terms of the GNU General Public License version 3.0 as
-published by the Free Software Foundation and appearing in the file LICENSE included in the
-packaging of this file.
-
-Please review the following information to ensure the GNU General Public License version 3.0
-requirements will be met: http://www.gnu.org/copyleft/gpl.html.
-
-If you are unsure which license is appropriate for your use, please contact the sales department
-at http://www.sencha.com/contact.
-
-Build date: 2013-03-11 22:33:40 (aed16176e68b5e8aa1433452b12805c0ad913836)
-*/
-/**
- * Simplified Chinese translation
- * By DavidHu
- * 09 April 2007
- *
- * update by andy_ghg
- * 2009-10-22 15:00:57
- */
 Ext.onReady(function() {
     var cm = Ext.ClassManager,
         exists = Ext.Function.bind(cm.get, cm),
@@ -297,6 +270,13 @@ Ext.define("Ext.locale.zh_CN.grid.PropertyColumnModel", {
     dateFormat: "y年m月d日"
 });
 
+Ext.define("Ext.locale.zh_CN.VForm", {
+    override: "FastUI.view.VForm",
+    successText:'成功',
+    failureText:'失败',
+    invalidText:'无效'
+});
+
 // This is needed until we can refactor all of the locales into individual files
 Ext.define("Ext.locale.zh_CN.Component", {	
     override: "Ext.Component"

data/app/assets/javascripts/fastui/fastui.js

@@ -11,6 +11,8 @@ Ext.application({
     appFolder:'/assets/fastui/app',
 
 
+
+
     launch: function() {
 
         //Ext.Viewport.setMasked(false);

data/app/controllers/fastui/m_list_items_controller.rb

@@ -22,7 +22,7 @@ module Fastui
 
     def edit
       @m_list_item = MListItem.find(params[:id])
-      respond_with(@m_list_item)
+      respond_with(@m_list_item.to_json(:include => [:m_list]))
     end
 
     def new

data/app/controllers/fastui/m_menu_items_controller.rb

@@ -16,7 +16,7 @@ module Fastui
       #  @m_menu_items = MMenuItem.where({:parent_id => params[:id]}.delete_if { |k, v| v.blank?})
         #@m_menu_items = paginate(@items)
       #end
-      respond_with(@m_menu_items.to_json(:include => [:m_menu, :createdbyorg, :createdby, :updatedby], :methods => [:leaf?, :child?]))
+      respond_with(@m_menu_items.to_json(:include => [:m_menu, :createdbyorg, :createdby, :updatedby], :methods => [:leaf, :expanded]))
     end
 
     def show

data/app/controllers/fastui/m_orgs_controller.rb

@@ -6,11 +6,11 @@ module Fastui
 
     def index
       #@m_orgs = MOrg.scoped
-      @m_orgs = params[:node] == 'root' ? MOrg.roots : MOrg.where({
+      @m_orgs = params[:node] == '' ? MOrg.roots : MOrg.where({
                                                                     :parent_id => params[:node]
                                                                 }.delete_if { |k, v| v.blank? })
 
-      respond_with(@m_orgs.to_json(:include => [:parent], :methods => [:leaf?, :child?]))
+      respond_with(@m_orgs.to_json(:include => [:parent], :methods => [:leaf, :expanded]))
     end
 
     def show

data/app/models/fastui/m_menu_item.rb

@@ -7,5 +7,8 @@ module Fastui
 
     belongs_to :m_menu, :class_name => 'Fastui::MMenu'
 
+    alias :leaf :leaf?
+    alias :expanded :child?
+
   end
 end