diff --git a/app/controllers/management/complaints_controller.rb b/app/controllers/management/complaints_controller.rb index 59741bd9e108549d8682acb68bd88d512c983abb..fdcaa4775291b38b7e7e0af753db8a999304dbb7 100644 --- a/app/controllers/management/complaints_controller.rb +++ b/app/controllers/management/complaints_controller.rb @@ -1,16 +1,13 @@ class Management::ComplaintsController < ManagementController include RepositoriesProxy + before_action :set_complaint, only: :destroy def index @complaints = complaint_repository.all end - def show - @complaints = complaint_repository.all - end - def destroy - complaint_repository.destroy(user_rid, object_rid) + complaint_repository.destroy @complaint respond_to do |format| format.html { redirect_to :back, notice: 'Denúncia excluÃda com sucesso.' } @@ -19,6 +16,10 @@ class Management::ComplaintsController < ManagementController 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(:id, :object, :message, :description) diff --git a/app/views/management/complaints/index.html.erb b/app/views/management/complaints/index.html.erb index 0d5d5821e80dc42b9cbd3fcffa79766e1f6d7d0b..7c98a566ee84145fcab596731fdafe0d11e6147b 100644 --- a/app/views/management/complaints/index.html.erb +++ b/app/views/management/complaints/index.html.erb @@ -75,49 +75,51 @@ </div> </div> - <div class="ls-chart"> - <div class="ls-tabs-container" id="awesome-tab-content"> - <div id="infoAll" class="ls-tab-content" role="tabpanel"> - <% @complaints.each do |complaint| %> + <div class="ls-tabs-container" id="awesome-tab-content"> + <div id="infoAll" class="ls-tab-content" role="tabpanel" style="display: block;"> + <% @complaints.each do |complaint| %> - <div class="ls-list"> - <header class="ls-list-header"> - <div class="ls-list-title col-md-9"> - <strong><%= complaint.object.name %></strong> - <small><%= complaint.message %></small> + <div class="ls-list"> + <header class="ls-list-header"> + <div class="ls-list-title col-md-9"> + <strong><%= complaint.object.name %></strong> + <small><%= complaint.message %></small> - <% if !complaint.description.blank? %> - <p><%= complaint.description %></p> - <% end %> + <% if !complaint.description.blank? %> + <p><%= complaint.description %></p> + <% end %> + </div> + <div class="col-md-3 ls-txt-right"> + <div data-ls-module="dropdown" class="ls-dropdown ls-pos-right"> + <a href="#" class="ls-btn-primary" aria-expanded="false" role="combobox">Administrar</a> + <ul class="ls-dropdown-nav" aria-hidden="true"> + <li><a href="#" role="option" title="Funcionalidade em desenvolvimento!">Suspender conteúdo</a></li> + <li> + <%= link_to 'Ignorar denúncia', destroy_mana %> + <a href="#" role="option">Ignorar denúncia</a> + </li> + </ul> </div> - <div class="col-md-3 ls-txt-right"> - <div data-ls-module="dropdown" class="ls-dropdown ls-pos-right"> - <a href="#" class="ls-btn-primary" aria-expanded="false" role="combobox">Administrar</a> - <ul class="ls-dropdown-nav" aria-hidden="true"> - <li><a href="#" role="option">Suspender conteúdo</a></li> - <li><a href="#" role="option">Ignorar denúncia</a></li> - </ul> - </div> - </div> - </header> - <div class="ls-list-content "> - <div class="col-xs-12 col-md-6"> - <span class="ls-list-label">Denunciado por</span> - <strong><%= complaint.user.name %></strong> - </div> - <div class="col-xs-12 col-md-6"> - <span class="ls-list-label">Data</span> - <strong><%= complaint.created_at %></strong> - </div> + </div> + </header> + <div class="ls-list-content "> + <div class="col-xs-12 col-md-6"> + <span class="ls-list-label">Denunciado por</span> + <strong><%= complaint.user.name %></strong> + </div> + <div class="col-xs-12 col-md-6"> + <span class="ls-list-label">Data</span> + <strong><%= complaint.created_at %></strong> </div> </div> + </div> - <% end %> - </div> + <% end %> </div> - </div> +</div> + </div> \ No newline at end of file diff --git a/app/views/management/complaints/show.html.erb b/app/views/management/complaints/show.html.erb index 6ef12f6bf1dd515d90346c275dfe45c72ffff91b..4a706713209327af4adebe76f2c2e9165a0247ec 100644 --- a/app/views/management/complaints/show.html.erb +++ b/app/views/management/complaints/show.html.erb @@ -96,8 +96,11 @@ <div data-ls-module="dropdown" class="ls-dropdown ls-pos-right"> <a href="#" class="ls-btn-primary" aria-expanded="false" role="combobox">Administrar</a> <ul class="ls-dropdown-nav" aria-hidden="true"> - <li><a href="#" role="option">Suspender conteúdo</a></li> - <li><a href="#" role="option">Ignorar denúncia</a></li> + <li><a href="#" role="option" title="Funcionalidade em desenvolvimento!">Suspender conteúdo</a></li> + <li> + <%= link_to 'Ignorar denúncia', destroy_mana %> + <a href="#" role="option">Ignorar denúncia</a> + </li> </ul> </div> </div> diff --git a/config/routes.rb b/config/routes.rb index 1ee3309be64032cd162e3be43b33268ff0b71519..3394943267b68f8cb81e40d083f987f462a4a2d7 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -9,7 +9,7 @@ Rails.application.routes.draw do namespace :management do root 'welcome#index' - resource :complaints, except: ['create'] + resources :complaints, only: [:index, :destroy] resources :institutions do member do post '/user/:user_id', as: :add_user, action: :add_user