Fully internationalise the issues and reports interfaces.

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

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index b636b981c21543555f9cf8ffaba5b1338bceed28..75eb3dd3af801bd3aa9bfe815b8bb3b873af0674 100644 (file)
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -4,10 +4,12 @@ class IssuesController < ApplicationController
   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 :check_permission
   before_action :find_issue, :only => [:show, :resolve, :reopen, :ignore]
 
   def index
+    @title = t ".title"
+
     if current_user.moderator?
       @issue_types = @moderator_issues
       @users = User.joins(:roles).where(:user_roles => { :role => "moderator" })
@@ -24,7 +26,7 @@ class IssuesController < ApplicationController
       if @find_user
         @issues = @issues.where(:reported_user_id => @find_user.id)
       else
-        notice = t("issues.index.search.user_not_found")
+        notice = t("issues.index.user_not_found")
       end
     end
 
@@ -58,40 +60,6 @@ class IssuesController < ApplicationController
     @new_comment = IssueComment.new(:issue => @issue)
   end
 
-  def update
-    @issue = Issue.find_by(issue_params)
-    # Check if details provided are sufficient
-    if check_report_params
-      @report = @issue.reports.where(:reporter_user_id => current_user.id).first
-
-      if @report.nil?
-        @report = @issue.reports.build(report_params)
-        @report.reporter_user_id = current_user.id
-        notice = t("issues.update.new_report")
-      end
-
-      details = 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
-
-      notice = t("issues.update.successful_update") if notice.nil?
-
-      if @report.save!
-        @issue.report_count = @issue.reports.count
-        @issue.save!
-        redirect_back :fallback_location => "/", :notice => notice
-      end
-    else
-      redirect_to new_issue_path(:reportable_type => @issue.reportable_type, :reportable_id => @issue.reportable_id), :notice => t("issues.update.provide_details")
-    end
-  end
-
   # Status Transistions
   def resolve
     if @issue.resolve
@@ -137,14 +105,6 @@ class IssuesController < ApplicationController
     end
   end
 
-  def report_details
-    params[:report][:details] + "--||--" + params[:report_type].to_s + "--||--"
-  end
-
-  def check_report_params
-    params[:report] && params[:report][:details] && params[:report_type]
-  end
-
   def find_issue
     @issue = Issue.find(params[:id])
   end