Merge branch 'master' into moderation

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

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index c1c5dd4f3d41b25dd175144b208c1fa66f1ada81..90fd0306dc2d7523326554e430775046b779e471 100644 (file)
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -3,57 +3,62 @@ class IssuesController < ApplicationController
 
   before_action :authorize_web
   before_action :require_user
 
   before_action :authorize_web
   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 :set_issues
+  before_action :check_permission
+  before_action :find_issue, :only => [:show, :resolve, :reopen, :ignore]

 
   def index
 
   def index

-    @issues = Issue.all
-  end
+    @title = t ".title"

 
 

-  def show
-    @read_reports = @issue.read_reports
-    @unread_reports = @issue.unread_reports
-    @comments = @issue.comments
-    @related_issues = @issue.user.issues
-  end
-
-  def new
-    unless create_new_issue_params.blank?
-      @issue = Issue.find_or_initialize_by(create_new_issue_params)
+    if current_user.moderator?
+      @issue_types = @moderator_issues
+      @users = User.joins(:roles).where(:user_roles => { :role => "moderator" })
+    else
+      @issue_types = @admin_issues
+      @users = User.joins(:roles).where(:user_roles => { :role => "administrator" })

     end
     end

-  end

 
 

-  def create
-    @issue = Issue.find_by_reportable_id_and_reportable_type(params[:reportable_id],params[:reportable_type])
-    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
+    @issues = Issue.where(:assigned_role => current_user.roles.map(&:role))
+
+    # If search
+    if params[:search_by_user] && params[:search_by_user].present?
+      @find_user = User.find_by(:display_name => params[:search_by_user])
+      if @find_user
+        @issues = @issues.where(:reported_user_id => @find_user.id)
+      else
+        notice = t("issues.index.user_not_found")

       end
     end
       end
     end

-    @report = @issue.reports.build(report_params)
-    @report.user_id = @user.id
-    if @issue.save!
-      redirect_to root_path, notice: 'Your report has been registered sucessfully.'
-    else
-      render :new
+
+    if params[:status] && params[:status][0].present?
+      @issues = @issues.where(:status => params[:status][0])
+    end
+
+    if params[:issue_type] && params[:issue_type][0].present?
+      @issues = @issues.where(:reportable_type => params[:issue_type][0])
+    end
+
+    if params[:last_updated_by] && params[:last_updated_by][0].present?
+      last_updated_by = params[:last_updated_by][0].to_s == "nil" ? nil : params[:last_updated_by][0].to_i
+      @issues = @issues.where(:updated_by => last_updated_by)

     end
     end

+
+    redirect_to issues_path, :notice => notice if notice

   end
 
   end
 

-  def comment
-    @issue = Issue.find(params[:id])
-    @issue_comment = @issue.comments.build(issue_comment_params)
-    @issue_comment.user_id = @user.id
-    @issue_comment.save!
-    redirect_to @issue
+  def show
+    @read_reports = @issue.read_reports
+    @unread_reports = @issue.unread_reports
+    @comments = @issue.comments
+    @related_issues = @issue.reported_user.issues.where(:assigned_role => current_user.roles.map(&:role)) if @issue.reported_user
+    @new_comment = IssueComment.new(:issue => @issue)

   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


@@ -61,8 +66,9 @@ class IssuesController < ApplicationController
 
   def ignore
     if @issue.ignore
 
   def ignore
     if @issue.ignore

+      @issue.updated_by = current_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


@@ -70,8 +76,9 @@ class IssuesController < ApplicationController
 
   def reopen
     if @issue.reopen
 
   def reopen
     if @issue.reopen

+      @issue.updated_by = current_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
     else
       render :show
     end


@@ -79,30 +86,47 @@ class IssuesController < ApplicationController
 
   private
 
 
   private
 

-    def find_issue
-      @issue = Issue.find(params[:id])
-    end
+  def set_issues
+    @admin_issues = %w[DiaryEntry DiaryComment User]
+    @moderator_issues = %w[Note]
+  end

 
 

-    def check_permission
-      unless @user.administrator?
-        flash[:error] = t("application.require_admin.not_an_admin")
-        redirect_to root_path
-      end
+  def check_if_updated
+    if @issue.reportable && (@issue.ignored? || @issue.resolved?) && @issue.reportable.has_attribute?(:updated_by) && @issue.reportable.updated_at > @last_report.updated_at
+      true
+    else
+      false

     end
     end

+  end

 
 

-    def create_new_issue_params
-      params.permit(:reportable_id, :reportable_type, :reported_user_id)
-    end
+  def find_issue
+    @issue = Issue.find(params[:id])
+  end

 
 

-    def issue_params
-      params[:issue].permit(:reportable_id, :reportable_type,:reported_user_id)
+  def check_permission
+    unless current_user.administrator? || current_user.moderator?
+      flash[:error] = t("application.require_admin.not_an_admin")
+      redirect_to root_path

     end
     end

+  end

 
 

-    def report_params
-      params[:report].permit(:details)
-    end
+  def issue_params
+    params[:issue].permit(:reportable_id, :reportable_type)
+  end

 
 

-    def issue_comment_params
-      params.require(:issue_comment).permit(:body, :user_id)
-    end
+  def report_params
+    params[:report].permit(:details)
+  end
+
+  def issue_comment_params
+    params.require(:issue_comment).permit(:body)
+  end
+
+  def sort_column
+    Issue.column_names.include?(params[:sort]) ? params[:sort] : "status"
+  end
+
+  def sort_direction
+    %w[asc desc].include?(params[:direction]) ? params[:direction] : "asc"
+  end

 end
 end