Merge pull request #270 from performant-software/feature/dm269_null_user

DM #269 - Null user
performant-software · Mar 5, 2021 · fdbd643 · fdbd643
2 parents f0d5f16 + 8c5478d
commit fdbd643
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/app/controllers/documents_controller.rb b/app/controllers/documents_controller.rb
@@ -6,7 +6,7 @@ class DocumentsController < ApplicationController
   before_action only: [:show] do
     validate_user_read(@project)
   end
-  before_action only: [:create] do
+  before_action only: [:create, :lock] do
     validate_user_write(@project)
   end
   before_action only: [:move] do

diff --git a/app/models/user.rb b/app/models/user.rb
@@ -12,6 +12,8 @@ class User < ActiveRecord::Base
   scope :is_admin, -> { where(admin: true) }
 
   after_create :after_user_create
+  before_destroy :unlock_documents
+
   def after_user_create
     if User.count == 1
       User.first.update({admin: true, approved: true})
@@ -52,4 +54,10 @@ def can_write(project)
   def can_admin(project)
     self.admin? || self.adminable_projects.include?(project)
   end
+
+  def unlock_documents
+    Document
+      .where(locked_by_id: self.id)
+      .update_all(locked_by_id: nil, locked: false)
+  end
 end