Update attributes prop (#720)

Flexberry · Aug 14, 2020 · e6787e3 · e6787e3
1 parent 82fdcec
commit e6787e3
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,9 +3,14 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [0.15.0-beta.1]
+### Fixed
+* Fix user access table.
+* Fix attributes property.
+
 ## [0.14.3]
 ### Added
-* Clear mofule settings button.
+* Clear module settings button.
 
 ## [0.14.2]
 ### Fixed

diff --git a/addon/locales/en/components/fd-attribute-table.js b/addon/locales/en/components/fd-attribute-table.js
@@ -10,6 +10,7 @@ export default {
     'caption-placeholder': 'Enter caption',
     'type': 'Type',
     'type-placeholder': 'Enter type',
+    'not-null': 'Not null',
     'description': 'Description',
     'description-placeholder': 'Enter description',
     'create-btn': 'Create attribute',

diff --git a/addon/locales/ru/components/fd-attribute-table.js b/addon/locales/ru/components/fd-attribute-table.js
@@ -12,6 +12,7 @@ export default {
     'type-placeholder': 'Введите тип',
     'description': 'Описание',
     'description-placeholder': 'Введите описание',
+    'not-null': 'Не пустое',
     'create-btn': 'Создать атрибут',
     'delete-btn': 'Удалить выбранные',
   },

diff --git a/addon/mixins/fd-editing-panels/fd-update-attribute-value.js b/addon/mixins/fd-editing-panels/fd-update-attribute-value.js
@@ -40,11 +40,21 @@ export default Mixin.create({
       columnProperty: 'type',
       attrPlaceholder: 'components.fd-attribute-table.attribute.type-placeholder',
     },
+    {
+      columnCaption: 'components.fd-attribute-table.attribute.not-null',
+      columnProperty: 'notNull',
+      isCheckBox: true,
+    },
+    {
+      columnCaption: 'components.fd-attribute-table.attribute.default-value',
+      columnProperty: 'defaultValue',
+      attrPlaceholder: 'components.fd-attribute-table.attribute.default-value-placeholder',
+    },
     {
       columnCaption: 'components.fd-attribute-table.attribute.description',
       columnProperty: 'description',
       attrPlaceholder: 'components.fd-attribute-table.attribute.description-placeholder',
-    },
+    }
   ],
 
   /**

diff --git a/addon/templates/components/fd-attribute-table.hbs b/addon/templates/components/fd-attribute-table.hbs
@@ -28,12 +28,19 @@
               readonly=(or readonly tableTextBoxReadonly)
             }}
           {{else}}
-            {{flexberry-textbox
-              value=(mut (get value tableView.columnProperty))
-              class='fluid input'
-              placeholder=(t tableView.attrPlaceholder)
-              readonly=(or readonly tableTextBoxReadonly)
-            }}
+            {{#if tableView.isCheckBox}}
+              {{flexberry-checkbox
+                readonly=(or readonly tableTextBoxReadonly)
+                value=(mut (get value tableView.columnProperty))
+              }}
+            {{else}}
+              {{flexberry-textbox
+                value=(mut (get value tableView.columnProperty))
+                class='fluid input'
+                placeholder=(t tableView.attrPlaceholder)
+                readonly=(or readonly tableTextBoxReadonly)
+              }}
+            {{/if}}
           {{/if}}
         </div>
       {{/each}}

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-flexberry-designer",
-  "version": "0.14.3",
+  "version": "0.15.0-beta.1",
   "description": "CASE addon for ember-flexberry applications",
   "keywords": [
     "ember-addon",