UI changes + Redirection after creating report fixed

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

diff --git a/app/models/issue.rb b/app/models/issue.rb
index 1726e690fe2d3c33f14560bffb07dfe79bc6507a..690a024772038c1b2aab89243fe155e1257a61c2 100644 (file)
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -1,20 +1,26 @@
 class Issue < ActiveRecord::Base
        belongs_to :reportable, :polymorphic => true
 class Issue < ActiveRecord::Base
        belongs_to :reportable, :polymorphic => true

-       has_many :reports
+       belongs_to :user, :class_name => "User", :foreign_key => :reported_user_id
+       belongs_to :user_updated, :class_name => "User", :foreign_key => :updated_by
+
+       has_many :reports, dependent: :destroy
+       has_many :comments, :class_name => "IssueComment", dependent: :destroy
+       

        validates :reportable_id, :uniqueness => { :scope => [ :reportable_type ] }
        validates :reportable_id, :uniqueness => { :scope => [ :reportable_type ] }

-       belongs_to :user_id
+       validates :reported_user_id, :presence => true

 
        # Check if more statuses are needed
        enum status: %w( open ignored resolved )
 
        # Check if more statuses are needed
        enum status: %w( open ignored resolved )

+       enum type: %w( administrator moderator )

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

-               resolved_at.present? ? reports.where("created_at < ?", resolved_at) : nil
+               resolved_at.present? ? reports.where("updated_at < ?", resolved_at) : nil

        end
 
        def unread_reports
        end
 
        def unread_reports

-    resolved_at.present? ? reports.where("created_at >= ?", resolved_at) : reports
+    resolved_at.present? ? reports.where("updated_at >= ?", resolved_at) : reports

        end
 
        include AASM
        end
 
        include AASM


@@ -36,8 +42,8 @@ class Issue < ActiveRecord::Base
 
                event :reopen do
                        transitions :from => :resolved, :to => :open
 
                event :reopen do
                        transitions :from => :resolved, :to => :open

+                       transitions :from => :ignored, :to => :open

                end
 
        end
                end
 
        end

-

 end
 end