Merge branch 'Dev'

Arteha · Dec 27, 2019 · d860a1e · d860a1e
2 parents 743c46c + b0bec76
commit d860a1e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 13 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "admin-bro-typeorm",
-  "version": "0.1.6-alpha.4",
+  "version": "0.1.6-alpha.5",
   "description": "TypeORM adapter for AdminBro",
   "keywords": [
     "typeorm",

diff --git a/src/Property.ts b/src/Property.ts
@@ -101,11 +101,11 @@ export class Property extends BaseProperty
 
         type = type || "string";
 
-        if(type == "string" && Reflect.getMetadata(TEXTAREA_SYMBOL, this.resource.model, this.name()))
+        if(
+            ["string", "richtext"].includes(type) &&
+            Reflect.getMetadata(TEXTAREA_SYMBOL, this.resource.model, this.name())
+        )
             return "textarea";
-        // TODO: Uncomment this in future.
-        /*if(Reflect.getMetadata(TEXTAREA_SYMBOL, this.resource.model, this.name()))
-            return "textarea";*/
 
         return type;
     }

diff --git a/src/Resource.ts b/src/Resource.ts
@@ -210,17 +210,16 @@ export class Resource extends BaseResource
         for (const p in params)
         {
             const property = this.property(p);
-            if(property)
+            if(property && params[p])
             {
-                if(property.type() === "mixed")
+                if(["mixed", "boolean"].includes(property.type()))
                     params[p] = JSON.parse(params[p]);
-                if(property.type() === "number" && params[p] && params[p].toString().length)
-                    params[p] = +params[p];
-                if(property.type() === "reference" && params[p] && params[p].toString().length)
-                {
-                    // references can be stored as an IDs in typeorm:
+                else if(["number", "float"].includes(property.type()))
+                    params[p] = Number(params[p]);
+                else if(["date", "datetime"].includes(property.type()))
+                    params[p] = new Date(params[p]);
+                else if(property.type() == "reference")
                     params[property.column.propertyName] = +params[p];
-                }
             }
         }
         return params;