Moved strings to locales + Added 'Issues' button + Fixed typo in tests

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

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index c1c5dd4f3d41b25dd175144b208c1fa66f1ada81..edb48e64c0d73a4b38ea3b3cf3800a7fed2d0efc 100644 (file)
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -32,19 +32,37 @@ class IssuesController < ApplicationController
         Notifier.new_issue_notification(User.find(admin.user_id)).deliver_now
       end
     end
         Notifier.new_issue_notification(User.find(admin.user_id)).deliver_now
       end
     end

-    @report = @issue.reports.build(report_params)
-    @report.user_id = @user.id
-    if @issue.save!
-      redirect_to root_path, notice: 'Your report has been registered sucessfully.'
+    if params[:report][:details] and (params[:spam] or params[:offensive] or params[:threat] or params[:vandal] or params[:other])
+      @report = @issue.reports.build(report_params)
+      details =  params[:report][:details].to_s + "||" + params[:spam].to_s + "||" + params[:offensive].to_s + "||" + params[:threat].to_s + "||" + params[:vandal].to_s + "||" + params[:other].to_s
+      @report.reporter_user_id = @user.id
+      @report.details = details
+      if @issue.save!
+        redirect_to root_path, notice: t('issues.create.successful_report')
+      end

     else
     else

-      render :new
+      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
   end
 
     end
   end
 

+  def update
+    @issue = Issue.find_by(issue_params)
+    if params[:report][:details] and (params[:spam] or params[:offensive] or params[:threat] or params[:vandal] or params[:other])
+      @report = @issue.reports.where(reporter_user_id: @user.id).first
+      details =  params[:report][:details].to_s + "||" + params[:spam].to_s + "||" + params[:offensive].to_s + "||" + params[:threat].to_s + "||" + params[:vandal].to_s + "||" + params[:other].to_s
+      @report.details = details    
+      if @report.save!
+        redirect_to root_path, notice: t('issues.update.successful_update')
+      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  
+  end
+

   def comment
     @issue = Issue.find(params[:id])
     @issue_comment = @issue.comments.build(issue_comment_params)
   def comment
     @issue = Issue.find(params[:id])
     @issue_comment = @issue.comments.build(issue_comment_params)

-    @issue_comment.user_id = @user.id
+    @issue_comment.commenter_user_id = @user.id

     @issue_comment.save!
     redirect_to @issue
   end
     @issue_comment.save!
     redirect_to @issue
   end


@@ -53,7 +71,7 @@ class IssuesController < ApplicationController
   def resolve
     if @issue.resolve
       @issue.save!
   def resolve
     if @issue.resolve
       @issue.save!

-      redirect_to @issue, notice: "Issue status has been set to: 'Resolved'"
+      redirect_to @issue, notice: t('issues.resolved')

     else
       render :show
     end
     else
       render :show
     end


@@ -62,7 +80,7 @@ class IssuesController < ApplicationController
   def ignore
     if @issue.ignore
       @issue.save!
   def ignore
     if @issue.ignore
       @issue.save!

-      redirect_to @issue, notice: "Issue status has been set to: 'Ignored'"
+      redirect_to @issue, notice: t('issues.ignored')

     else
       render :show
     end
     else
       render :show
     end


@@ -71,7 +89,7 @@ class IssuesController < ApplicationController
   def reopen
     if @issue.reopen
       @issue.save!
   def reopen
     if @issue.reopen
       @issue.save!

-      redirect_to @issue, notice: "Issue status has been set to: 'Open'"
+      redirect_to @issue, notice: t('issues.reopened')

     else
       render :show
     end
     else
       render :show
     end


@@ -103,6 +121,6 @@ class IssuesController < ApplicationController
     end
 
     def issue_comment_params
     end
 
     def issue_comment_params

-      params.require(:issue_comment).permit(:body, :user_id)
+      params.require(:issue_comment).permit(:body)

     end
 end
     end
 end