not-node 5.0.11 → 5.0.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "not-node",
-  "version": "5.0.11",
+  "version": "5.0.14",
   "description": "node complimentary part for client side notFramework.",
   "main": "index.js",
   "scripts": {

package/src/core/locales/en.json

@@ -46,5 +46,12 @@
   "field_userId_placeholder": "UserId",
 
   "field_UUID_label": "UUID",
-  "field_UUID_placeholder": "UUID"
+  "field_UUID_placeholder": "UUID",
+
+  "crud_create_action_waiting": "Creating record...",
+  "crud_read_action_waiting": "Reading record...",
+  "crud_update_action_waiting": "Updating record...",
+  "crud_delete_action_waiting": "Deleting record...",
+  "add_label": "Add",
+  "select_from_list_label": "Select from list..."
 }

package/src/core/locales/ru.json

@@ -46,5 +46,13 @@
   "field_userId_placeholder": "",
 
   "field_UUID_label": "UUID",
-  "field_UUID_placeholder": "UUID"
+  "field_UUID_placeholder": "UUID",
+
+  "crud_create_action_waiting": "Создание записи...",
+  "crud_read_action_waiting": "Чтение записи...",
+  "crud_update_action_waiting": "Обновление записи...",
+  "crud_delete_action_waiting": "Удаление записи...",
+  "add_label": "Добавить",
+  "select_from_list_label": "Выберите из списка..."
+
 }

package/src/model/default.js

@@ -74,13 +74,15 @@ function sanitizeInput(input) {
 *	@static
 *	@param 	{string}	id 	primary key
 *	@param 	{Array}		population 	optional if needed population of some fields
+*	@param 	{Object}	condition 	optional if needed additional condition
 *	@return {Promise}	Promise
 **/
-function getOne(id, population = []) {
+function getOne(id, population = [], condition = {}) {
   let query;
   if (this.schema.statics.__versioning) {
     query = this.findOne({
       _id: id,
+      ...condition,
       __latest: true,
       __closed: false
     });
@@ -91,7 +93,8 @@ function getOne(id, population = []) {
     }
   } else {
     query = this.findOne({
-      _id: id
+      _id: id,
+      ...condition
     });
   }
   populateQuery(query, population, this.schema.statics.__versioning);
@@ -103,14 +106,18 @@ function getOne(id, population = []) {
 *	If versioning ON, it retrieves __latest and not __closed
 *	@static
 *	@param 	{number}	ID		some unique numeric identificator
+*	@param 	{Object}	condition 	optional if needed additional condition
 *	@return {Promise}	      Promise of document, if increment is OFF - then Promise.resolve(null)
 **/
-function getOneByID(ID) {
+function getOneByID(ID, condition = {}) {
   if (this.schema.statics.__incField) {
     let by = (this.schema.statics.__versioning ? {
+        ...condition,
         __latest: true,
-        __closed: false
-      } : {}),
+        __closed: false,
+      } : {
+        ...condition
+      }),
       query;
     by[this.schema.statics.__incField] = ID;
     query = this.findOne(by);
@@ -125,11 +132,13 @@ function getOneByID(ID) {
 *	Retrieves one record by primary key, without any restriction
 *	@static
 *	@param 	{string}	id 	primary key
+*	@param 	{Object}	condition 	optional if needed additional condition
 *	@return {Promise}	Promise
 **/
-function getOneRaw(id) {
+function getOneRaw(id, condition = {}) {
   let query = this.findOne({
-    _id: id
+    _id: id,
+    ...condition
   });
   return query.exec();
 }