Merge branch 'Dev'

Arteha · Dec 26, 2019 · 244feb0 · 244feb0
2 parents ef5e6bc + f5a3dea
commit 244feb0
Show file tree

Hide file tree

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

diff --git a/src/Property.ts b/src/Property.ts
@@ -83,10 +83,12 @@ export class Property extends BaseProperty
         {
             if (this.column.type == Number)
                 type = "number";
-            if (this.column.type == String)
+            else if (this.column.type == String)
                 type = "string";
-            if (this.column.type == Date)
+            else if (this.column.type == Date)
                 type = "datetime";
+            else if (this.column.type == Boolean)
+                type = "boolean";
         }
         else
             type = DATA_TYPES[ this.column.type as any ];