diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 6ade665f9..4d8b53e3c 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -679,15 +679,15 @@ module ApplicationHelper def textilizable(*args) options = args.last.is_a?(Hash) ? args.pop : {} case args.size - when 1 - obj = options[:object] - text = args.shift - when 2 - obj = args.shift - attr = args.shift - text = obj.send(attr).html_safe.to_s - else - raise ArgumentError, 'invalid arguments to textilizable' + when 1 + obj = options[:object] + text = args.shift + when 2 + obj = args.shift + attr = args.shift + text = obj.send(attr).to_s + else + raise ArgumentError, 'invalid arguments to textilizable' end return '' if text.blank? project = options[:project] || @project || (obj && obj.respond_to?(:project) ? obj.project : nil) @@ -727,7 +727,7 @@ module ApplicationHelper when 2 obj = args.shift attr = args.shift - text = obj.send(attr).html_safe.to_s + text = obj.send(attr).to_s else raise ArgumentError, 'invalid arguments to textilizable' end diff --git a/app/views/bids/_history.html.erb b/app/views/bids/_history.html.erb index b0bc22479..0961e3cf8 100644 --- a/app/views/bids/_history.html.erb +++ b/app/views/bids/_history.html.erb @@ -5,7 +5,7 @@
<%= render :partial => 'new', :locals => {:bid => @bid, :sta => @state} %>
-<% label = ''; +<% label = '' case @bid.reward_type when 1 label = l(:label_respond_requirement) diff --git a/app/views/bids/_new.html.erb b/app/views/bids/_new.html.erb index cf9f8df30..7dd7492c0 100644 --- a/app/views/bids/_new.html.erb +++ b/app/views/bids/_new.html.erb @@ -41,7 +41,7 @@ + <%= submit_tag l(:button_clear_meassge), :name => nil, :onclick => "clearMessage('bid_message_message');", :type => 'button', :class => "bid_btn", :onmouseout => "this.style.backgroundPosition = 'left top'", :onmouseover => "this.style.backgroundPosition = 'left -31px'" %>
<%= submit_tag l(:button_leave_meassge), :name => nil , :class => "bid_btn", :onmouseout => "this.style.backgroundPosition = 'left top'", :onmouseover => "this.style.backgroundPosition = 'left -31px'"%> - <%= submit_tag l(:button_clear), :name => nil, :onclick => "clearMessage('bid_message_message');", :type => 'button', :class => "bid_btn", :onmouseout => "this.style.backgroundPosition = 'left top'", :onmouseover => "this.style.backgroundPosition = 'left -31px'" %>
diff --git a/app/views/bids/show.html.erb b/app/views/bids/show.html.erb index 96ed4ea75..3107d8bd6 100644 --- a/app/views/bids/show.html.erb +++ b/app/views/bids/show.html.erb @@ -4,11 +4,11 @@

<%= link_to(@bid.author.lastname+@bid.author.firstname, user_path(@bid.author))%>:<%= link_to(@bid.name,respond_path(@bid)) %>

<% if @bid.reward_type.nil? or @bid.reward_type == 1%> -

+

<%= l(:label_bids_reward_method) %><%= l(:label_call_bonus) %>  <%= l(:label_RMB_sign) %><%= @bid.budget %>

<% elsif @bid.reward_type == 2%> -

+

<%= l(:label_bids_reward_method) %><%= @bid.budget%>

<% else %> diff --git a/app/views/issues/_list.html.erb b/app/views/issues/_list.html.erb index 0a8402609..4c2a63844 100644 --- a/app/views/issues/_list.html.erb +++ b/app/views/issues/_list.html.erb @@ -39,7 +39,7 @@