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 7cd21d5124185e39f827c8856388e5f136536260..beb1425cd3775744b3bd42554c3c34138034c219 100644 (file)
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -5,23 +5,30 @@ 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

-    if params[:search_by_user].present?
-      @user = User.find_by_display_name(params[:search_by_user])
-      if @user.present?
-        @issues = Issue.where(reported_user_id: @user.id).order(:status)
+    # 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 
       else 

-        @issues = Issue.all.order(:status)
-        redirect_to issues_path, notice: t('issues.index.search.user_not_found') 
+        @issues = Issue.where(issue_type: @user_role).order(:status)
+        notice = t('issues.index.search.user_not_found') 

       end
       end

-      
-      if @user.present? and not @issues.present?
-        @issues = Issue.all.order(:status)
-        redirect_to issues_path, notice: t('issues.index.search.issues_not_found')
+
+      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
       end

+
+      if notice
+        redirect_to issues_path, notice: notice
+      end 
+    

     else
     else

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

     end
   end
 
     end
   end
 


@@ -29,26 +36,44 @@ class IssuesController < ApplicationController
     @read_reports = @issue.read_reports
     @unread_reports = @issue.unread_reports
     @comments = @issue.comments
     @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)
       path = 'issues.report_strings.' + @issue.reportable.class.name.to_s
   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)
+      @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])
     # Check if Issue alrwady exists
     if !@issue 
       @issue = Issue.find_or_initialize_by(issue_params)
     @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)

-      @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
 
     # Check if details provided are sufficient
     end
 
     # Check if details provided are sufficient


@@ -110,10 +135,21 @@ class IssuesController < ApplicationController
 
   def comment
     @issue = Issue.find(params[:id])
 
   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
   end
 
   # Status Transistions


@@ -128,6 +164,7 @@ class IssuesController < ApplicationController
 
   def ignore
     if @issue.ignore
 
   def ignore
     if @issue.ignore

+      @issue.updated_by = @user.id

       @issue.save!
       redirect_to @issue, notice: t('issues.ignored')
     else
       @issue.save!
       redirect_to @issue, notice: t('issues.ignored')
     else


@@ -137,6 +174,7 @@ class IssuesController < ApplicationController
 
   def reopen
     if @issue.reopen
 
   def reopen
     if @issue.reopen

+      @issue.updated_by = @user.id      

       @issue.save!
       redirect_to @issue, notice: t('issues.reopened')
     else
       @issue.save!
       redirect_to @issue, notice: t('issues.reopened')
     else


@@ -144,9 +182,27 @@ class IssuesController < ApplicationController
     end
   end
 
     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
     def check_if_updated
       if @issue.reportable and (@issue.ignored? or @issue.resolved?) and @issue.reportable.updated_at > @last_report.updated_at
         return true


@@ -157,25 +213,13 @@ class IssuesController < ApplicationController
  
     def get_report_details
       details = params[:report][:details] + "--||--"
  
     def get_report_details
       details = params[:report][:details] + "--||--"

-      path = 'issues.report_strings.' + @issue.reportable.class.name.to_s
-      @report_strings_yaml = t( path)
-      @report_strings_yaml.each do |k,v|
-        if params[k.to_sym]
-          details = details + params[k.to_sym] + "--||--"
-        end
-      end
+      details = details + params[:report_type].to_s + "--||--"

       return details
     end
 
     def check_report_params
       return details
     end
 
     def check_report_params

-      path = 'issues.report_strings.' + @issue.reportable.class.name.to_s
-      @report_strings_yaml = t( path)
-      if params[:report] and params[:report][:details]
-        @report_strings_yaml.each do |k,v|
-          if params[k.to_sym]
-            return true
-          end
-        end
+      if params[:report] and params[:report][:details] and params[:report_type]
+        return true

       end
       return false
     end
       end
       return false
     end


@@ -185,7 +229,7 @@ class IssuesController < ApplicationController
     end
 
     def check_permission
     end
 
     def check_permission

-      unless @user.administrator?
+      unless @user.administrator? or @user.moderator?

         flash[:error] = t('application.require_admin.not_an_admin')
         redirect_to root_path
       end
         flash[:error] = t('application.require_admin.not_an_admin')
         redirect_to root_path
       end