Fixed link to DiaryComments

[rails.git] / app / controllers / issues_controller.rb

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 3cd0ceda09a785bb7348527b731b2025be36c05f..beb1425cd3775744b3bd42554c3c34138034c219 100644 (file)
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -5,69 +5,158 @@ class IssuesController < ApplicationController
   before_action :require_user
   before_action :check_permission, only: [:index, :show, :resolve,:open,:ignore,:comment]
   before_action :find_issue, only: [:show, :resolve, :reopen, :ignore]
   before_action :require_user
   before_action :check_permission, only: [:index, :show, :resolve,:open,:ignore,:comment]
   before_action :find_issue, only: [:show, :resolve, :reopen, :ignore]

+  before_action :get_user_role, only: [:show, :index]

 
   def index
 
   def index

-    @issues = Issue.all
+    # If search
+    if params[:search_by_user]
+      @find_user = User.find_by_display_name(params[:search_by_user])
+      if @find_user
+        @issues = Issue.where(reported_user_id: @find_user.id, issue_type: @user_role).order(:status)
+      else 
+        @issues = Issue.where(issue_type: @user_role).order(:status)
+        notice = t('issues.index.search.user_not_found') 
+      end
+
+      if @find_user !=nil and @issues.first == nil
+        @issues = Issue.where(issue_type: @user_role).order(:status)
+        notice = t('issues.index.search.issues_not_found')
+      end
+
+      if notice
+        redirect_to issues_path, notice: notice
+      end 
+    
+    else
+      @issues = Issue.where(issue_type: @user_role).order(:status)
+    end

   end
 
   def show
     @read_reports = @issue.read_reports
     @unread_reports = @issue.unread_reports
     @comments = @issue.comments
   end
 
   def show
     @read_reports = @issue.read_reports
     @unread_reports = @issue.unread_reports
     @comments = @issue.comments

-    @related_issues = @issue.user.issues
+    @related_issues = @issue.user.issues.where(issue_type: @user_role)
+    if @issue.updated_by
+      @updated_by_admin = User.find(@issue.updated_by)
+    end

   end
 
   def new
     unless create_new_issue_params.blank?
       @issue = Issue.find_or_initialize_by(create_new_issue_params)
   end
 
   def new
     unless create_new_issue_params.blank?
       @issue = Issue.find_or_initialize_by(create_new_issue_params)

+      path = 'issues.report_strings.' + @issue.reportable.class.name.to_s
+      @report_strings_yaml = t(path)

     end
   end
 
   def create
     end
   end
 
   def create

+
+    # TODO: Find better place to add these
+    admin_issues = [ 'DiaryEntry', 'DiaryComment', 'User']
+    moderator_issues = [ 'Changeset' ]
+
+    

     @issue = Issue.find_by_reportable_id_and_reportable_type(params[:reportable_id],params[:reportable_type])
     @issue = Issue.find_by_reportable_id_and_reportable_type(params[:reportable_id],params[:reportable_type])

+    # Check if Issue alrwady exists

     if !@issue 
       @issue = Issue.find_or_initialize_by(issue_params)
     if !@issue 
       @issue = Issue.find_or_initialize_by(issue_params)

-      @admins = UserRole.where(role: "administrator")
-      @admins.each do |admin|
-        Notifier.new_issue_notification(User.find(admin.user_id)).deliver_now
+      @issue.updated_by = nil
+
+      # Reassign to moderators if it is a moderator issue
+      @issue.issue_type = "administrator"
+      if moderator_issues.include? @issue.reportable.class.name
+        reassign_issue

       end
       end

+
+      @admins_or_mods = UserRole.where(role: @issue.issue_type)
+      @admins_or_mods.each do |user|
+        Notifier.new_issue_notification(User.find(user.user_id)).deliver_now
+      end
+

     end
     end

-    @report = @issue.reports.build(report_params)
-    details =  params[:report][:details].to_s + "||" + params[:spam].to_s + "||" + params[:offensive].to_s + "||" + params[:threat].to_s + "||" + params[:vandal].to_s + "||" + params[:other].to_s
-    @report.reporter_user_id = @user.id
-    @report.details = details
-    if @issue.save!
-      redirect_to root_path, notice: 'Your report has been registered sucessfully.'
+
+    # Check if details provided are sufficient
+    if check_report_params
+      @report = @issue.reports.build(report_params)
+      details =  get_report_details
+      @report.reporter_user_id = @user.id
+      @report.details = details
+
+      # Checking if instance has been updated since last report
+      @last_report = @issue.reports.order(updated_at: :desc).last
+      if check_if_updated
+        if @issue.reopen
+          @issue.save!
+        end
+      end
+
+      if @issue.save!
+        redirect_to root_path, notice: t('issues.create.successful_report')
+      end

     else
     else

-      render :new
+      redirect_to new_issue_path(reportable_type: @issue.reportable_type,reportable_id: @issue.reportable_id, reported_user_id: @issue.reported_user_id), notice: t('issues.create.provide_details')

     end
   end
 
   def update
     @issue = Issue.find_by(issue_params)
     end
   end
 
   def update
     @issue = Issue.find_by(issue_params)

-    @report = @issue.reports.where(reporter_user_id: @user.id).first
-    details =  params[:report][:details].to_s + "||" + params[:spam].to_s + "||" + params[:offensive].to_s + "||" + params[:threat].to_s + "||" + params[:vandal].to_s + "||" + params[:other].to_s
-    @report.details = details    
-    if @report.save!
-      redirect_to root_path, notice: 'Your report was successfully updated.'
+    # Check if details provided are sufficient
+    if check_report_params
+      @report = @issue.reports.where(reporter_user_id: @user.id).first
+      
+      if @report == nil
+        @report = @issue.reports.build(report_params)
+        @report.reporter_user_id = @user.id
+        notice = t('issues.update.new_report')
+      end
+
+      details =  get_report_details
+      @report.details = details    
+
+    # Checking if instance has been updated since last report
+      @last_report = @issue.reports.order(updated_at: :desc).last
+      if check_if_updated
+        @issue.reopen
+        @issue.save!
+      end
+
+      if notice == nil
+        notice = t('issues.update.successful_update')
+      end
+
+      if @report.save!
+        redirect_to root_path, notice: notice
+      end

     else
     else

-      render :edit
+      redirect_to new_issue_path(reportable_type: @issue.reportable_type,reportable_id: @issue.reportable_id, reported_user_id: @issue.reported_user_id), notice: t('issues.update.provide_details')

     end  
   end
 
   def comment
     @issue = Issue.find(params[:id])
     end  
   end
 
   def comment
     @issue = Issue.find(params[:id])

-    @issue_comment = @issue.comments.build(issue_comment_params)
-    @issue_comment.commenter_user_id = @user.id
-    @issue_comment.save!
-    redirect_to @issue
+    if issue_comment_params.blank?
+      notice = t('issues.comment.provide_details')
+    else
+      @issue_comment = @issue.comments.build(issue_comment_params)
+      @issue_comment.commenter_user_id = @user.id
+      if params[:reassign]
+        reassign_issue
+        @issue_comment.reassign = true
+      end
+      @issue_comment.save!
+      @issue.updated_by = @user.id
+      @issue.save!
+      notice = t('issues.comment.comment_created')
+    end
+    redirect_to @issue, notice: notice

   end
 
   # Status Transistions
   def resolve
     if @issue.resolve
       @issue.save!
   end
 
   # Status Transistions
   def resolve
     if @issue.resolve
       @issue.save!

-      redirect_to @issue, notice: "Issue status has been set to: 'Resolved'"
+      redirect_to @issue, notice: t('issues.resolved')

     else
       render :show
     end
     else
       render :show
     end


@@ -75,8 +164,9 @@ class IssuesController < ApplicationController
 
   def ignore
     if @issue.ignore
 
   def ignore
     if @issue.ignore

+      @issue.updated_by = @user.id

       @issue.save!
       @issue.save!

-      redirect_to @issue, notice: "Issue status has been set to: 'Ignored'"
+      redirect_to @issue, notice: t('issues.ignored')

     else
       render :show
     end
     else
       render :show
     end


@@ -84,22 +174,63 @@ class IssuesController < ApplicationController
 
   def reopen
     if @issue.reopen
 
   def reopen
     if @issue.reopen

+      @issue.updated_by = @user.id      

       @issue.save!
       @issue.save!

-      redirect_to @issue, notice: "Issue status has been set to: 'Open'"
+      redirect_to @issue, notice: t('issues.reopened')

     else
       render :show
     end
   end
 
     else
       render :show
     end
   end
 

+  # Reassign Issues between Administrators and Moderators
+  def reassign_issue
+    if @issue.issue_type == "moderator"
+      @issue.issue_type = "administrator"
+    else
+      @issue.issue_type = "moderator"
+    end
+    @issue.save!
+  end
+

   private
 
   private
 

+    def get_user_role
+      # Get user role
+      if @user.administrator?
+        @user_role = "administrator"
+      else
+        @user_role = "moderator"
+      end      
+    end
+    
+    def check_if_updated
+      if @issue.reportable and (@issue.ignored? or @issue.resolved?) and @issue.reportable.updated_at > @last_report.updated_at
+        return true
+      else
+        return false
+      end
+    end
+ 
+    def get_report_details
+      details = params[:report][:details] + "--||--"
+      details = details + params[:report_type].to_s + "--||--"
+      return details
+    end
+
+    def check_report_params
+      if params[:report] and params[:report][:details] and params[:report_type]
+        return true
+      end
+      return false
+    end
+

     def find_issue
       @issue = Issue.find(params[:id])
     end
 
     def check_permission
     def find_issue
       @issue = Issue.find(params[:id])
     end
 
     def check_permission

-      unless @user.administrator?
-        flash[:error] = t("application.require_admin.not_an_admin")
+      unless @user.administrator? or @user.moderator?
+        flash[:error] = t('application.require_admin.not_an_admin')

         redirect_to root_path
       end
     end
         redirect_to root_path
       end
     end


@@ -119,4 +250,5 @@ class IssuesController < ApplicationController
     def issue_comment_params
       params.require(:issue_comment).permit(:body)
     end
     def issue_comment_params
       params.require(:issue_comment).permit(:body)
     end

+

 end
 end