From e74163d036a0520de62667b2e77ffbe66bc7c72d Mon Sep 17 00:00:00 2001 From: Shrey Date: Mon, 15 Jun 2015 22:39:02 +0530 Subject: [PATCH] Replaced check_box_tags with radio_button --- app/controllers/issues_controller.rb | 18 +++--------------- app/views/issues/_reports.html.erb | 8 +++----- app/views/issues/new.html.erb | 4 ++-- 3 files changed, 8 insertions(+), 22 deletions(-) diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 576b3309f..dc357a6ae 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -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 diff --git a/app/views/issues/_reports.html.erb b/app/views/issues/_reports.html.erb index 94ae3ca0e..2aff5dbc9 100644 --- a/app/views/issues/_reports.html.erb +++ b/app/views/issues/_reports.html.erb @@ -5,13 +5,11 @@ <%= link_to report.user.display_name, :controller => :user,:action =>:view, :display_name => report.user.display_name %>
<% details = report.details.split("--||--") %> - <%= details[0] %> + + <%= details[1] %>
+ <%= details[0] %>
- - <% details[1..(details.size-1)].each do |tags| %> - <%= tags %> - <% end %>
On <%= l report.created_at.to_datetime, :format => :long %> diff --git a/app/views/issues/new.html.erb b/app/views/issues/new.html.erb index 8a0055e51..e42ec19a6 100644 --- a/app/views/issues/new.html.erb +++ b/app/views/issues/new.html.erb @@ -17,7 +17,7 @@ <% @report_strings_yaml.each do |k,v| %>
- <%= check_box_tag k.to_sym, v[:type].to_s %> + <%= radio_button_tag :report_type, v[:type].to_s %>
<%= label_tag v[:details].to_s %>
@@ -26,7 +26,7 @@
<% end %> -
+
<%= text_area :report, :details, :cols => 80, :rows => 20, placeholder: t('issues.new.details'), required: true %>
-- 2.43.2