cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replaced check_box_tags with radio_button

Browse source
This commit is contained in:
Shrey 2015-06-15 22:39:02 +05:30 • committed by Matt Amos
parent dc173881e5
commit e74163d036
3 changed files with 8 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

18
app/controllers/issues_controller.rb
View file

@ -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

8
app/views/issues/_reports.html.erb
View file

@ -5,14 +5,12 @@
</div>
<b><%= link_to report.user.display_name, :controller => :user,:action =>:view, :display_name => report.user.display_name %></b> <br/>
<% details = report.details.split("--||--") %>
<label>Tag:</label>
<%= details[1] %>
<br/>
<%= details[0] %>
<br/>
<br/>
<label>Tags:</label>
<% details[1..(details.size-1)].each do |tags| %>
<%= tags %>
<% end %>
<br/>
<span class="deemphasize">
On <%= l report.created_at.to_datetime, :format => :long %> </span>
</div>

4
app/views/issues/new.html.erb
View file

@ -17,7 +17,7 @@
<% @report_strings_yaml.each do |k,v| %>
<div class="new-report-form">
<div class="new-report-checkbox">
<%= check_box_tag k.to_sym, v[:type].to_s %>
<%= radio_button_tag :report_type, v[:type].to_s %>
</div>
<div class="new-report-string">
<%= label_tag v[:details].to_s %> <br/>
@ -26,7 +26,7 @@
<br/>
<% end %>
<label class="standard-label"><b><%= t 'issue.new.message' -%>: </b></label> <br/>
<label class="standard-label"><b><%= t 'issue.new.message' %>: </b></label> <br/>
<%= text_area :report, :details, :cols => 80, :rows => 20, placeholder: t('issues.new.details'), required: true %>
</div>