@azrico/webobject 1.4.92 → 1.4.94

package/dist/src/WebObjects/WebObject.js

@@ -509,7 +509,7 @@ var WebObject = /*#__PURE__*/function (_SimpleObject, _setMetaValue, _Save, _Del
         return _regeneratorRuntime().wrap(function _callee9$(_context9) {
           while (1) switch (_context9.prev = _context9.next) {
             case 0:
-              this.isDeleted = true;
+              if (this.isSaved) this.isDeleted = true;
               for (_len = _args9.length, p = new Array(_len), _key = 0; _key < _len; _key++) {
                 p[_key] = _args9[_key];
               }

package/dist/src/WebObjects/WebObjectManager.js

@@ -109,29 +109,31 @@ var WebObjectManager = /*#__PURE__*/function (_ObjectManager, _setMetaValue, _ge
         }, _callee2);
       })));
       _this.event_add("on_delete", "on_delete-sendmsg", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+        var srType;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              _context3.t0 = _this.getSaveResultType();
-              _context3.next = _context3.t0 === "normal" ? 3 : 6;
+              srType = _this.getSaveResultType();
+              _context3.t0 = srType;
+              _context3.next = _context3.t0 === "normal" ? 4 : 7;
               break;
-            case 3:
-              _context3.next = 5;
+            case 4:
+              _context3.next = 6;
               return _global.gfunc.run_action("show_message", {
                 message: "Deleted",
                 type: "success"
               });
-            case 5:
-              return _context3.abrupt("return", _context3.sent);
             case 6:
-              _context3.next = 8;
+              return _context3.abrupt("return", _context3.sent);
+            case 7:
+              _context3.next = 9;
               return _global.gfunc.run_action("show_message", {
-                message: "Not deleted",
+                message: "Not deleted (".concat(srType, ")"),
                 type: "error"
               });
-            case 8:
-              return _context3.abrupt("return", _context3.sent);
             case 9:
+              return _context3.abrupt("return", _context3.sent);
+            case 10:
             case "end":
               return _context3.stop();
           }
@@ -331,17 +333,14 @@ var WebObjectManager = /*#__PURE__*/function (_ObjectManager, _setMetaValue, _ge
         return _regeneratorRuntime().wrap(function _callee9$(_context9) {
           while (1) switch (_context9.prev = _context9.next) {
             case 0:
-              if (this.obj) {
-                this.obj.isDeleted = true;
-              }
-              _context9.next = 3;
+              _context9.next = 2;
               return this.event_run("on_delete");
-            case 3:
-              _context9.next = 5;
+            case 2:
+              _context9.next = 4;
               return this.event_run("on_after_delete");
-            case 5:
+            case 4:
               return _context9.abrupt("return", true);
-            case 6:
+            case 5:
             case "end":
               return _context9.stop();
           }
@@ -355,17 +354,14 @@ var WebObjectManager = /*#__PURE__*/function (_ObjectManager, _setMetaValue, _ge
         return _regeneratorRuntime().wrap(function _callee10$(_context10) {
           while (1) switch (_context10.prev = _context10.next) {
             case 0:
-              if (this.obj && this.isSaved) {
-                this.obj.isArchived = true;
-              }
-              _context10.next = 3;
+              _context10.next = 2;
               return this.event_run("on_archive");
-            case 3:
-              _context10.next = 5;
+            case 2:
+              _context10.next = 4;
               return this.event_run("on_after_archive");
-            case 5:
+            case 4:
               return _context10.abrupt("return", true);
-            case 6:
+            case 5:
             case "end":
               return _context10.stop();
           }
@@ -379,17 +375,14 @@ var WebObjectManager = /*#__PURE__*/function (_ObjectManager, _setMetaValue, _ge
         return _regeneratorRuntime().wrap(function _callee11$(_context11) {
           while (1) switch (_context11.prev = _context11.next) {
             case 0:
-              if (this.obj && this.isSaved) {
-                this.obj.isArchived = false;
-              }
-              _context11.next = 3;
+              _context11.next = 2;
               return this.event_run("on_unarchive");
-            case 3:
-              _context11.next = 5;
+            case 2:
+              _context11.next = 4;
               return this.event_run("on_after_unarchive");
-            case 5:
+            case 4:
               return _context11.abrupt("return", true);
-            case 6:
+            case 5:
             case "end":
               return _context11.stop();
           }

package/package.json

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