hola-server 0.3.24 → 0.3.26

package/db/entity.js

@@ -901,9 +901,11 @@ class Entity {
     /**
      * Convert ref element object id to ref_label
      * @param {element of object} elements 
+     * @param {*} passed_ref_fields, if not pass, use all meta ref_fields
      * @returns 
      */
-    async convert_ref_attrs(elements, ref_fields) {
+    async convert_ref_attrs(elements, passed_ref_fields) {
+        const ref_fields = passed_ref_fields ? passed_ref_fields : this.meta.ref_fields;
         if (elements && ref_fields && ref_fields.length > 0) {
             for (let i = 0; i < ref_fields.length; i++) {
                 const ref_field = ref_fields[i];
@@ -1022,13 +1024,13 @@ class Entity {
     * get ref labels of the object, use ref_filter
     * @returns 
     */
-    get_filtered_ref_labels() {
+    get_filtered_ref_labels(ref_by_entity) {
         let query = {};
         if (this.meta.user_field) {
             query[this.meta.user_field] = get_session_userid();
         }
         if (this.meta.ref_filter) {
-            query = { ...query, ...this.meta.ref_filter };
+            query = ref_by_entity && this.meta.ref_filter[ref_by_entity] ? { ...query, ...this.meta.ref_filter[ref_by_entity] } : { ...query, ...this.meta.ref_filter };
         }
         return this.find_sort(query, { [this.meta.ref_label]: 1 }, { [this.meta.ref_label]: 1 });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hola-server",
-  "version": "0.3.24",
+  "version": "0.3.26",
   "description": "a meta programming framework used to build nodejs restful api",
   "main": "index.js",
   "scripts": {

package/router/read.js

@@ -1,4 +1,4 @@
-const { required_post_params } = require('../http/params');
+const { required_post_params, get_params } = require('../http/params');
 const { has_value } = require('../core/validate');
 const { NO_PARAMS, SUCCESS } = require('../http/code');
 const { get_session_userid } = require('../http/session');
@@ -30,7 +30,8 @@ const init_read_router = function (router, meta) {
     }));
 
     router.get('/ref', wrap_http(async function (req, res) {
-        const list = await entity.get_filtered_ref_labels();
+        const { ref_by_entity } = get_params(req, ["ref_by_entity"]);
+        const list = await entity.get_filtered_ref_labels(ref_by_entity);
         const items = list.map(obj => ({ "text": obj[meta.ref_label], "value": obj["_id"] + "" }));
         res.json({ code: SUCCESS, data: items });
     }));