UI changes + Redirection after creating report fixed

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

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 6ef7b04235b4943d6d115f184755a9494dd2335a..81bf7606c3e715564433785f7900f0b2763f7e3e 100644 (file)
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -3,46 +3,68 @@ class IssuesController < ApplicationController
 
   before_action :authorize_web
   before_action :require_user
 
   before_action :authorize_web
   before_action :require_user

+  before_action :set_issues

   before_action :check_permission, only: [:index, :show, :resolve,:open,:ignore,:comment]
   before_action :find_issue, only: [:show, :resolve, :reopen, :ignore]
   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]
+
+  helper_method :sort_column, :sort_direction

 
   def index
 
   def index

-    # Get user role
-    if @user.administrator?
-      @user_role = "administrator"
+    if @user.moderator?
+      @issue_types = @moderator_issues
+      @users = User.joins(:roles).where(user_roles: {role: 'moderator'})

     else
     else

-      @user_role = "moderator"
+      @issue_types = @admin_issues
+      @users = User.joins(:roles).where(user_roles: {role: 'administrator'})

     end
 
     end
 

+    @issues = Issue.where(issue_type: @user_role).order(sort_column + " " + sort_direction)
+

     # If search
     # If search

-    if params[:search_by_user]
+    if params[:search_by_user] and !params[:search_by_user].blank?

       @find_user = User.find_by_display_name(params[:search_by_user])
       if @find_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)
+        @issues = @issues.where(reported_user_id: @find_user.id)

       else 
       else 

-        @issues = Issue.where(issue_type: @user_role).order(:status)

         notice = t('issues.index.search.user_not_found') 
       end
         notice = t('issues.index.search.user_not_found') 
       end

+    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)
+    if params[:status] and !params[:status][0].blank?
+      @issues = @issues.where(status: params[:status][0].to_i)
+    end
+
+    if params[:issue_type] and !params[:issue_type][0].blank?
+      @issues = @issues.where(reportable_type: params[:issue_type][0])

     end
     end

+
+    # If last_updated_by
+    if params[:last_updated_by] and !params[:last_updated_by][0].blank?
+      last_reported_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
+
+    if @issues.first == nil
+        notice = t('issues.index.search.issues_not_found')      
+    end
+
+    if params[:last_reported_by] and !params[:last_reported_by][0].blank?
+      last_reported_by = params[:last_reported_by][0].to_s == "nil" ? nil : params[:last_reported_by][0].to_i
+      @issues = @issues.where(updated_by: last_reported_by)
+    end
+
+    if notice
+      redirect_to issues_path, notice: notice
+    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
     if @issue.updated_by
       @updated_by_admin = User.find(@issue.updated_by)
     end


@@ -53,29 +75,20 @@ class IssuesController < ApplicationController
       @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)
       @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)

+      flash[:referer] = params[:referer]

     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
+    # Check if Issue already exists

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

-      @admins = UserRole.where(role: "administrator")
-      @admins.each do |admin|
-        Notifier.new_issue_notification(User.find(admin.user_id)).deliver_now
-      end

 
       # Reassign to moderators if it is a moderator issue
       @issue.issue_type = "administrator"
 
       # Reassign to moderators if it is a moderator issue
       @issue.issue_type = "administrator"

-      if moderator_issues.include? @issue.reportable.class.name
+      if @moderator_issues.include? @issue.reportable.class.name

         reassign_issue
       end
     end
         reassign_issue
       end
     end


@@ -86,7 +99,6 @@ class IssuesController < ApplicationController
       details =  get_report_details
       @report.reporter_user_id = @user.id
       @report.details = details
       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
       # Checking if instance has been updated since last report
       @last_report = @issue.reports.order(updated_at: :desc).last
       if check_if_updated


@@ -96,7 +108,15 @@ class IssuesController < ApplicationController
       end
 
       if @issue.save!
       end
 
       if @issue.save!

-        redirect_to root_path, notice: t('issues.create.successful_report')
+        @issue.report_count = @issue.reports.count
+        @issue.save!
+        
+        @admins_or_mods = UserRole.where(role: @issue.issue_type)
+        @admins_or_mods.each do |user|
+          Notifier.new_issue_notification(@issue.id, User.find(user.user_id)).deliver_now
+        end
+
+        redirect_to flash[:referer], notice: t('issues.create.successful_report')

       end
     else
       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
     else
       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')


@@ -129,8 +149,11 @@ class IssuesController < ApplicationController
         notice = t('issues.update.successful_update')
       end
 
         notice = t('issues.update.successful_update')
       end
 

+

       if @report.save!
       if @report.save!

-        redirect_to root_path, notice: notice
+        @issue.report_count = @issue.reports.count
+        @issue.save!
+        redirect_to flash[:referer], notice: notice

       end
     else
       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
     else
       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')


@@ -198,8 +221,22 @@ class IssuesController < ApplicationController
 
   private
 
 
   private
 

+    def set_issues
+      @admin_issues = [ 'DiaryEntry', 'DiaryComment', 'User']
+      @moderator_issues = [ 'Changeset', 'Note' ]
+    end
+
+    def get_user_role
+      # Get user role
+      if @user.administrator?
+        @user_role = "administrator"
+      else
+        @user_role = "moderator"
+      end      
+    end
+    

     def check_if_updated
     def check_if_updated

-      if @issue.reportable and (@issue.ignored? or @issue.resolved?) and @issue.reportable.updated_at > @last_report.updated_at
+      if @issue.reportable and (@issue.ignored? or @issue.resolved?) and @issue.reportable.has_attribute?(:updated_by) and @issue.reportable.updated_at > @last_report.updated_at

         return true
       else
         return false
         return true
       else
         return false


@@ -246,4 +283,11 @@ class IssuesController < ApplicationController
       params.require(:issue_comment).permit(:body)
     end
 
       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