Fix unexpected spacing on note buttons when overflowed

[rails.git] / app / models / issue.rb

diff --git a/app/models/issue.rb b/app/models/issue.rb
index dd068859a54dfb8bb8ded4abc4188605c9005a78..c0707728ee329bd17e19e1caba98980e085561d1 100644 (file)
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -30,9 +30,9 @@
 #  issues_updated_by_fkey        (updated_by => users.id)
 #
 
 #  issues_updated_by_fkey        (updated_by => users.id)
 #
 

-class Issue < ActiveRecord::Base
+class Issue < ApplicationRecord

   belongs_to :reportable, :polymorphic => true
   belongs_to :reportable, :polymorphic => true

-  belongs_to :reported_user, :class_name => "User", :foreign_key => :reported_user_id
+  belongs_to :reported_user, :class_name => "User"

   belongs_to :user_resolved, :class_name => "User", :foreign_key => :resolved_by
   belongs_to :user_updated, :class_name => "User", :foreign_key => :updated_by
 
   belongs_to :user_resolved, :class_name => "User", :foreign_key => :resolved_by
   belongs_to :user_updated, :class_name => "User", :foreign_key => :updated_by
 


@@ -44,10 +44,10 @@ class Issue < ActiveRecord::Base
   ASSIGNED_ROLES = %w[administrator moderator].freeze
   validates :assigned_role, :presence => true, :inclusion => ASSIGNED_ROLES
 
   ASSIGNED_ROLES = %w[administrator moderator].freeze
   validates :assigned_role, :presence => true, :inclusion => ASSIGNED_ROLES
 

-  before_validation :set_default_assigned_role

   before_validation :set_reported_user
 
   scope :with_status, ->(issue_status) { where(:status => statuses[issue_status]) }
   before_validation :set_reported_user
 
   scope :with_status, ->(issue_status) { where(:status => statuses[issue_status]) }

+  scope :visible_to, ->(user) { where(:assigned_role => user.roles.map(&:role)) }

 
   def read_reports
     resolved_at.present? ? reports.where("updated_at < ?", resolved_at) : nil
 
   def read_reports
     resolved_at.present? ? reports.where("updated_at < ?", resolved_at) : nil


@@ -92,13 +92,4 @@ class Issue < ActiveRecord::Base
                            reportable.user
                          end
   end
                            reportable.user
                          end
   end

-
-  def set_default_assigned_role
-    if assigned_role.blank?
-      self.assigned_role = case reportable
-                           when Note then "moderator"
-                           else "administrator"
-                           end
-    end
-  end

 end
 end