From f0c634f78761f76ab44ce4b6d3070af6cb29bca1 Mon Sep 17 00:00:00 2001 From: Mateus Rambo Strey <mars11@inf.ufpr.br> Date: Mon, 9 Nov 2015 15:23:51 -0200 Subject: [PATCH] fix complaint controller --- app/controllers/complaints_controller.rb | 42 ------------------- .../management/complaints_controller.rb | 22 +++++++++- app/views/complaints/_form.html.erb | 2 +- 3 files changed, 22 insertions(+), 44 deletions(-) delete mode 100644 app/controllers/complaints_controller.rb diff --git a/app/controllers/complaints_controller.rb b/app/controllers/complaints_controller.rb deleted file mode 100644 index 747badc1..00000000 --- a/app/controllers/complaints_controller.rb +++ /dev/null @@ -1,42 +0,0 @@ -class ComplaintsController < ApplicationController - before_action :set_complaint, only: [:show, :update, :destroy, :like] - - # POST /complaints - # POST /complaints.json - def create - @complaint = Complaint.new(complaint_params) - @complaint.user = current_user - @complaint.object = params[:complaint][:object_rid] - - respond_to do |format| - if complaint_repository.report @complaint - format.html { redirect_to :back, notice: 'Denúncia realizada com sucesso.' } - else - format.html { redirect_to :back, alert: 'Objeto já foi denunciado por você.' } - end - end - end - - # DELETE /complaints/1 - # DELETE /complaints/1.json - def destroy - complaint_repository.destroy @complaint - - respond_to do |format| - format.html { redirect_to complaints_url, notice: 'Complaint was successfully destroyed.' } - end - end - - - private - - def set_complaint - @complaint = complaint_repository.find params[:id] - end - - # Never trust parameters from the scary internet, only allow the white list through. - def complaint_params - params.require(:complaint).permit(:object, :message, :description) - end - -end diff --git a/app/controllers/management/complaints_controller.rb b/app/controllers/management/complaints_controller.rb index 1a85550f..75175bd0 100644 --- a/app/controllers/management/complaints_controller.rb +++ b/app/controllers/management/complaints_controller.rb @@ -2,7 +2,6 @@ class Management::ComplaintsController < ManagementController include RepositoriesProxy def index - end def show @@ -14,6 +13,20 @@ class Management::ComplaintsController < ManagementController end end + def create + @complaint = Complaint.new(complaint_params) + @complaint.user = current_user + @complaint.object = params[:complaint][:object_rid] + + respond_to do |format| + if complaint_repository.report @complaint + format.html { redirect_to :back, notice: 'Denúncia realizada com sucesso.' } + else + format.html { redirect_to :back, alert: 'Objeto já foi denunciado por você.' } + end + end + end + def destroy object_rid = params["object_rid"] @@ -26,4 +39,11 @@ class Management::ComplaintsController < ManagementController end + private + + # Never trust parameters from the scary internet, only allow the white list through. + def complaint_params + params.require(:complaint).permit(:object, :message, :description) + end + end diff --git a/app/views/complaints/_form.html.erb b/app/views/complaints/_form.html.erb index 0d62529c..40306095 100644 --- a/app/views/complaints/_form.html.erb +++ b/app/views/complaints/_form.html.erb @@ -1,5 +1,5 @@ -<%= form_for @complaint do |f| %> +<%= form_for [:management, @complaint] do |f| %> <fieldset> <div class="ls-label " > -- GitLab