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 24ac932d6974edec6236ce310e2148a5a6f3366d..beb1425cd3775744b3bd42554c3c34138034c219 100644 (file)
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -5,15 +5,9 @@ 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

-    # Get user role
-    if @user.administrator?
-      @user_role = "administrator"
-    else
-      @user_role = "moderator"
-    end
-

     # If search
     if params[:search_by_user]
       @find_user = User.find_by_display_name(params[:search_by_user])
     # If search
     if params[:search_by_user]
       @find_user = User.find_by_display_name(params[:search_by_user])


@@ -42,7 +36,7 @@ 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
     if @issue.updated_by
       @updated_by_admin = User.find(@issue.updated_by)
     end


@@ -52,28 +46,34 @@ class IssuesController < ApplicationController
     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
     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']
     admin_issues = [ 'DiaryEntry', 'DiaryComment', 'User']

-    moderator_issues = []
+    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.updated_by = nil
     @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.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"
       if moderator_issues.include? @issue.reportable.class.name
         reassign_issue
       end
 
       # Reassign to moderators if it is a moderator issue
       @issue.issue_type = "administrator"
       if moderator_issues.include? @issue.reportable.class.name
         reassign_issue
       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


@@ -135,16 +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
-    if params[:reassign]
-      reassign_issue
-      @issue_comment.reassign = true
-    end
-    @issue_comment.save!
-    @issue.updated_by = @user.id
-    @issue.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


@@ -189,6 +194,15 @@ class IssuesController < ApplicationController
 
   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


@@ -199,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


@@ -227,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