3 files changed, 0 insertions, 69 deletions

diff --git a/app/models/node.rb b/app/models/node.rb
index c8f9a210..1823daa4 100644
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -18,7 +18,6 @@ class Node < ApplicationRecord
   # them -- this dependent: :destroy is their only cleanup on node destroy.
   belongs_to  :autosave, :class_name => "Page", :foreign_key => :autosave_id, :dependent => :destroy, optional: true
 
-  has_many    :permissions, :dependent => :destroy
   has_many    :events, :dependent => :destroy
   belongs_to  :lock_owner, :class_name => "User", :foreign_key => :locking_user_id, optional: true
 
diff --git a/app/models/permission.rb b/app/models/permission.rb
deleted file mode 100644
index 1383a4b8..00000000
--- a/app/models/permission.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-class Permission < ApplicationRecord
-  # Validations
-  validates_presence_of   :user_id, :node_id, :granted
-  validates_inclusion_of  :granted, :in => [true, false]
-  
-  # Associations
-  belongs_to :user
-  belongs_to :node
-  
-  # Named scopes
-  scope :for_node, ->(node) { where('node_id = ?', (node.is_a?(Node) ? node.id : node)) }
-  scope :for_user, ->(user) { where('user_id = ?', (user.is_a?(User) ? user.id : user)) }
-end
diff --git a/app/models/user.rb b/app/models/user.rb
index 4d712f6c..e1eff059 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -9,9 +9,6 @@ class User < ApplicationRecord
   include Authentication
   include Authentication::ByPassword
 
-  # Associations
-  has_many :permissions
-
   # Validations
   validates_presence_of     :login
   validates_length_of       :login, :within => 1..40
@@ -62,46 +59,6 @@ class User < ApplicationRecord
     write_attribute :email, (value ? value.downcase : nil)
   end
   
-  # Permission stuff
-  
-  def grant(node)
-    set_permission(true, node)
-  end
-  
-  def revoke(node)
-    set_permission(false, node)
-  end
-
-  def inherit(node)    
-    permission = self.permissions.for_node(node).first
-    permission.destroy if permission
-  end
-  
-  def get_permission_for(node)
-    permissions = {}
-    self.permissions.for_node(node).each do |permission|
-      permissions[permission.identifier.to_sym] = permission.granted
-    end
-    permissions
-  end
-  
-  # Checks for permission on the node and if necessary ascends the
-  # nodetree until permission is found or returns false if it is not found 
-  # at all.
-  def has_permission?(node)
-    node_permission = self.permissions.for_node(node)
-    return node_permission unless node_permission.nil?
-
-    node.ancestors.reverse.each do |p|
-      local_permission = self.get_permissions_for(p)[identifier]
-      unless local_permission.nil?
-        return local_permission
-      end
-    end
-    
-    return false
-  end
-  
   def is_admin?
     !!admin
   end
@@ -176,16 +133,4 @@ class User < ApplicationRecord
     end
     true
   end
-  
-  private
-    
-    def set_permission(granted, node)    
-      permission = self.permissions.for_node(node).first
-      if permission
-        permission.granted = granted
-      else
-        self.permissions.create!( :node       => node, 
-                                  :granted    => granted )
-      end
-    end
 end