Added a few tests

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

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 576b3309fc29945e256ec1fc1a6871bd1cd5f3fd..bcea64be33de10c1f418d18571cd9ed9ee01bc37 100644 (file)
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -52,7 +52,7 @@ 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
-      @report_strings_yaml = t( path)
+      @report_strings_yaml = t(path)
     end
   end
 
@@ -203,25 +203,13 @@ class IssuesController < ApplicationController
  
     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
-      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
@@ -231,7 +219,7 @@ class IssuesController < ApplicationController
     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