Merge branch '2.x-release/v2.2.5' into 2.x

webreinvent · Jan 23, 2024 · 522d406 · 522d406
2 parents 509fa11 + ac18678
commit 522d406
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/Config/vaahcms.php b/Config/vaahcms.php
@@ -8,7 +8,7 @@
 $settings =  [
     'app_name' => 'VaahCMS',
     'app_slug' => 'vaahcms',
-    'version' => '2.2.4',
+    'version' => '2.2.5',
     'php_version_required' => '8.1',
     'get_config_version' => false,
     'website' => 'https://vaah.dev/cms',

diff --git a/Observers/CrudWithUuidObserver.php b/Observers/CrudWithUuidObserver.php
@@ -79,13 +79,18 @@ public function deleting( $model ) {
     //-----------------------------------------------------------
     public function deleted( $model )
     {
+
+        if($model->isForceDeleting()){
+            return false;
+        }
+
         $model->deleted_by = $this->user_id;
         $model->save();
     }
 
     //-----------------------------------------------------------
     public function restoring( $model ) {
-        
+
     }
 
     //-----------------------------------------------------------

diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "webreinvent/vaahcms",
-    "version": "2.2.4",
+    "version": "2.2.5",
     "description": "VaahCMS is a laravel based open-source web application development platform shipped with headless content management system.",
     "keywords": ["vaahcms", "headless", "hmvc", "laravel", "cms", "vue", "pinia"],
     "homepage": "https://webreinvent.com",