@azrico/webobject 1.4.11 → 1.4.13

package/dist/src/structs/MapableObject.js

@@ -4,8 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = exports.MapableObject = void 0;
-var _ObjectArray = _interopRequireDefault(require("./ObjectArray"));
 var _object = require("@azrico/object");
+var _ObjectArray = _interopRequireDefault(require("./ObjectArray"));
 var _string = require("@azrico/string");
 var _uid = require("@azrico/uid");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -55,8 +55,7 @@ var MapableObject = /*#__PURE__*/function () {
         objectlist = maptoType;
         maptoType = this;
       }
-      if (objectlist == null) return [];
-      if (objectlist.length === 0) return [];
+      if ((0, _object.object_isEmpty)(objectlist)) return [];
       if (objectlist instanceof _ObjectArray["default"]) objectlist = objectlist.getObjects();
       if (!Array.isArray(objectlist)) {
         objectlist = [objectlist];

package/dist/src/structs/SimpleObject.d.ts

@@ -96,7 +96,7 @@ export declare class SimpleObject extends MapableObject {
      * @returns
      */
     static canChangeKey(object: SimpleObject, key: string, useExtraProps: boolean): boolean;
-    static hasIllegalChanges(referenceObject: any, changesObject: any, userObject: any): boolean;
+    static hasIllegalChanges(referenceObject: any, changesObject: any, updaterUser: any): boolean;
     /**
      * Apply the changes and empty the delta object
      */

package/dist/src/structs/SimpleObject.js

@@ -8,6 +8,7 @@ var _global = require("@azrico/global");
 var _object = require("@azrico/object");
 var _MapableObject2 = require("./MapableObject");
 var _ObjectManager = _interopRequireDefault(require("./ObjectManager"));
+var _WebObject = _interopRequireDefault(require("../WebObjects/WebObject"));
 var _WebObjectManager = _interopRequireDefault(require("../WebObjects/WebObjectManager"));
 var _string = require("@azrico/string");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -864,16 +865,19 @@ var SimpleObject = /*#__PURE__*/function (_MapableObject) {
     }
   }, {
     key: "hasIllegalChanges",
-    value: function hasIllegalChanges(referenceObject, changesObject, userObject) {
+    value: function hasIllegalChanges(referenceObject, changesObject, updaterUser) {
       var __protectedProperties = (0, _object.object_getStatic)(referenceObject, "__protectedProperties");
       if (__protectedProperties == null) return false;
-      if (Boolean(_global.gfunc.run_action_sync("is_current_user", userObject || changesObject.__user || changesObject._creator))) return false;
+      var referenceUser = (0, _object.object_isClass)(referenceObject) ? (0, _object.object_get)(changesObject, "__user", "_creator") : (0, _object.object_get)(referenceObject, "__user", "_creator");
+      if (Boolean(_WebObject["default"].getID(referenceUser) == _WebObject["default"].getID(updaterUser))) {
+        return false;
+      }
       for (var key in changesObject) {
         if (__protectedProperties.includes(key)) {
-          return false;
+          return true;
         }
       }
-      return true;
+      return false;
     }
   }, {
     key: "setReadonly",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@azrico/webobject",
-    "version": "1.4.11",
+    "version": "1.4.13",
     "description": "Stateful object",
     "author": "Azrideus",
     "license": "MIT",