Enable Model properties

beeman · beeman · commit 370223c0a5ae · 2015-09-08T03:29:19.000+02:00
diff --git a/common/models/meta.js b/common/models/meta.js
@@ -7,42 +7,36 @@ module.exports = function (Meta) {
    * Helper method for format the type of the properties
    */
   function formatProperties (properties) {
-    //for (var key in properties) {
-    //  var type = properties[key].type.toString().toLowerCase().substr('function '.length);
-    //  type = type.substr(0, type.indexOf('('));
-    //  properties[key].type = type;
-    //}
+    for (var key in properties) {
+      var type = properties[key].type.toString().toLowerCase().substr('function '.length);
+      type = type.substr(0, type.indexOf('('));
+      properties[key].propertyType = type;
+    }
     return properties;
   }
 
-  /**
-   * Get the definition of the model
-   */
-  function getModelDefinition (modelName) {
-    return Meta.app.models[modelName].definition;
-  }
 
   /**
    * Get the definition of a model and format the result in a way that's similar to a LoopBack model definition file
    */
   function getModelInfo (modelName) {
 
-    // Get the model definition
-    var definition = getModelDefinition(modelName);
+    // Get the model
+    var model = Meta.app.models[modelName];
 
     // Create the base return object
     var result = {
-      id: definition.name,
-      name: definition.name,
-      properties: formatProperties(definition.properties)
+      id: model.definition.name,
+      name: model.definition.name,
+      properties: formatProperties(model.definition.properties)
     };
 
     // Get the following keys from the settings object, if they are set
     var keys = ['description', 'plural', 'base', 'idInjection', 'persistUndefinedAsNull', 'strict', 'hidden',
       'validations', 'relations', 'acls', 'methods', 'mixins'
     ];
     keys.forEach(function (key) {
-      result[key] = _.get(definition.settings, key);
+      result[key] = _.get(model.definition.settings, key);
     });
     return result;
   }
diff --git a/common/models/meta.json b/common/models/meta.json
@@ -50,61 +50,6 @@
         "path": "/:name",
         "verb": "get"
       }
-    },
-    "getModelItem": {
-      "isStatic": true,
-      "accepts": [
-        {
-          "arg": "modelName",
-          "type": "string",
-          "required": true
-        },
-        {
-          "arg": "modelId",
-          "type": "string",
-          "required": true
-        }
-      ],
-      "returns": {
-        "arg": "result",
-        "type": "object",
-        "root": true
-      },
-      "description": "Retrieve an instance of a model by model name and id",
-      "http": {
-        "path": "/getModelItem",
-        "verb": "get"
-      }
-    },
-    "getModelItems": {
-      "isStatic": true,
-      "accepts": [
-        {
-          "arg": "modelName",
-          "type": "string",
-          "required": true
-        },
-        {
-          "arg": "limit",
-          "type": "number",
-          "required": false
-        },
-        {
-          "arg": "offset",
-          "type": "number",
-          "required": false
-        }
-      ],
-      "returns": {
-        "arg": "result",
-        "type": "array",
-        "root": true
-      },
-      "description": "Retrieve instances of a model by model name",
-      "http": {
-        "path": "/getModelItems",
-        "verb": "get"
-      }
     }
   }
 }
