From 1d386d803cdb2190fdecaceb6def9f8372e29518 Mon Sep 17 00:00:00 2001 From: Giovanne Marcelo <gms15@inf.ufpr.br> Date: Mon, 22 Feb 2016 22:18:58 -0300 Subject: [PATCH] Adding complaints reason --- ...ler.rb => complaint_reasons_controller.rb} | 17 ++++++------ .../_form.html.erb | 2 +- .../edit.html.erb | 2 +- .../complaint_reasons/index.html.erb | 26 +++++++++++++++++++ .../new.html.erb | 0 .../complaints_reasons/index.html.erb | 26 ------------------- .../shared/management/_nav_menu.html.erb | 2 +- config/routes.rb | 2 +- 8 files changed, 38 insertions(+), 39 deletions(-) rename app/controllers/management/{complaints_reasons_controller.rb => complaint_reasons_controller.rb} (54%) rename app/views/management/{complaints_reasons => complaint_reasons}/_form.html.erb (92%) rename app/views/management/{complaints_reasons => complaint_reasons}/edit.html.erb (60%) create mode 100644 app/views/management/complaint_reasons/index.html.erb rename app/views/management/{complaints_reasons => complaint_reasons}/new.html.erb (100%) delete mode 100644 app/views/management/complaints_reasons/index.html.erb diff --git a/app/controllers/management/complaints_reasons_controller.rb b/app/controllers/management/complaint_reasons_controller.rb similarity index 54% rename from app/controllers/management/complaints_reasons_controller.rb rename to app/controllers/management/complaint_reasons_controller.rb index 7dd3412f..36d6c89f 100644 --- a/app/controllers/management/complaints_reasons_controller.rb +++ b/app/controllers/management/complaint_reasons_controller.rb @@ -1,7 +1,10 @@ -class Management::ComplaintsReasonsController < ManagementController +class Management::ComplaintReasonsController < ManagementController before_action :set_complaint_reason, only: [:destroy, :update, :edit] + def show + end + def index @complaint_reasons = ComplaintReason.all end @@ -16,11 +19,9 @@ class Management::ComplaintsReasonsController < ManagementController respond_to do |format| if @complaint_reason.save - format.html { redirect_to [:management, @complaint_reason], notice: 'Instituição criada com sucesso.' } - format.json { render :show, status: :created, location: @complaint_reason } + format.html { redirect_to management_complaint_reasons_path } else format.html { render :new } - format.json { render json: @complaint_reason.errors, status: :unprocessable_entity } end end end @@ -41,12 +42,10 @@ class Management::ComplaintsReasonsController < ManagementController def update respond_to do |format| - if @complaint_reason.update complaint_reason_params - format.html { redirect_to [:management, @complaint_reason], notice: 'Instituição modificada com sucesso.' } - format.json { render :show, status: :ok, location: @complaint_reason } + if @complaint_reason.save + format.html { redirect_to management_complaint_reasons_path } else - format.html { render :edit } - format.json { render json: @complaint_reason.errors, status: :unprocessable_entity } + format.html { render :new } end end end diff --git a/app/views/management/complaints_reasons/_form.html.erb b/app/views/management/complaint_reasons/_form.html.erb similarity index 92% rename from app/views/management/complaints_reasons/_form.html.erb rename to app/views/management/complaint_reasons/_form.html.erb index ddaa364e..07a08e4e 100644 --- a/app/views/management/complaints_reasons/_form.html.erb +++ b/app/views/management/complaint_reasons/_form.html.erb @@ -21,7 +21,7 @@ <div class="ls-actions-btn"> <button class="ls-btn">Salvar</button> - <%= link_to "Cancelar", management_complaints_reason_path,class: "ls-btn-danger"%> + <%= link_to "Cancelar", management_complaint_reasons_path,class: "ls-btn-danger"%> </div> <% end %> diff --git a/app/views/management/complaints_reasons/edit.html.erb b/app/views/management/complaint_reasons/edit.html.erb similarity index 60% rename from app/views/management/complaints_reasons/edit.html.erb rename to app/views/management/complaint_reasons/edit.html.erb index 5a7c8de1..58e8ac70 100644 --- a/app/views/management/complaints_reasons/edit.html.erb +++ b/app/views/management/complaint_reasons/edit.html.erb @@ -1,7 +1,7 @@ <h1 class="ls-title-intro ls-ico-star">Razões</h1> <ol class="ls-breadcrumb"> - <li><%= link_to 'Razões', management_complaints_reason_path %></li> + <li><%= link_to 'Razões', management_complaint_reason_path %></li> </ol> <%= render 'form' %> diff --git a/app/views/management/complaint_reasons/index.html.erb b/app/views/management/complaint_reasons/index.html.erb new file mode 100644 index 00000000..ccd43ae1 --- /dev/null +++ b/app/views/management/complaint_reasons/index.html.erb @@ -0,0 +1,26 @@ +<h1 class="ls-title-intro ls-ico-bullhorn">Denúncias</h1> + +<h2 class="ls-title-4">Razões das Denúncias</h2> + + +<div class="ls-clearfix"></div> + +<% @complaint_reasons.each do |complaint| %> +<div class="ls-list"> + <header class="ls-list-header"> + <div class="ls-list-title col-md-9"> + <a href="#" ><%= complaint.reason %></a> + </div> + <div class="col-md-3 ls-txt-right"> + <%= link_to 'Modificar', edit_management_complaint_reason_path(complaint), class:'ls-btn-primary ls-ico-cog' %> + <%= link_to 'Excluir', management_complaint_reason_path(id: complaint.id), {method: :delete, data: {confirm: 'Tem certeza que deseja excluir esta razão de denúncia?'}, title: 'Excluir', class: 'ls-btn ls-btn-sm', role: 'button'} %> + </div> + </header> +</div> +<% end %> + +<%= link_to 'Nova Razão', new_management_complaint_reason_path, title: 'Excluir', class: 'ls-btn ls-btn-sm', role: 'button' %> + + + +</div> diff --git a/app/views/management/complaints_reasons/new.html.erb b/app/views/management/complaint_reasons/new.html.erb similarity index 100% rename from app/views/management/complaints_reasons/new.html.erb rename to app/views/management/complaint_reasons/new.html.erb diff --git a/app/views/management/complaints_reasons/index.html.erb b/app/views/management/complaints_reasons/index.html.erb deleted file mode 100644 index 06c86cb8..00000000 --- a/app/views/management/complaints_reasons/index.html.erb +++ /dev/null @@ -1,26 +0,0 @@ -<h1 class="ls-title-intro ls-ico-bullhorn">Denúncias</h1> - -<h2 class="ls-title-4">Razões das Denúncias</h2> - - -<div class="ls-clearfix"></div> - -<% @complaint_reasons.each do |complaint| %> -<div class="ls-list"> - <header class="ls-list-header"> - <div class="ls-list-title col-md-9"> - <a href="#" ><%= complaint.reason %></a> - </div> - <div class="col-md-3 ls-txt-right"> - <%= link_to 'Modificar', edit_management_complaints_reason_path(complaint), class:'ls-btn-primary ls-ico-cog' %> - <%= link_to 'Excluir', management_complaints_reason_path(id: complaint.id), {method: :delete, data: {confirm: 'Tem certeza que deseja excluir esta razão de denúncia?'}, title: 'Excluir', class: 'ls-btn ls-btn-sm', role: 'button'} %> - </div> - </header> -</div> -<% end %> - -<%= link_to 'Nova Razão', new_management_complaints_reason_path, title: 'Excluir', class: 'ls-btn ls-btn-sm', role: 'button' %> - - - -</div> diff --git a/app/views/shared/management/_nav_menu.html.erb b/app/views/shared/management/_nav_menu.html.erb index 90afd036..8195fa2b 100644 --- a/app/views/shared/management/_nav_menu.html.erb +++ b/app/views/shared/management/_nav_menu.html.erb @@ -27,7 +27,7 @@ <a href="#" class="ls-ico-bullhorn">Denúncias</a> <ul role="menu"> <li><%= link_to "Denúncias", management_complaints_path, class: 'ls-submenu-item' %> - <li><%= link_to "Razões", management_complaints_reasons_path, class: 'ls-submenu-item' %> + <li><%= link_to "Razões", management_complaint_reasons_path, class: 'ls-submenu-item' %> </ul> </li> diff --git a/config/routes.rb b/config/routes.rb index f5196368..66838964 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -19,7 +19,7 @@ Rails.application.routes.draw do end end - resources :complaints_reasons + resources :complaint_reasons resources :highlights resources :carousels -- GitLab