Commit 77861d20827f064e837054347732fb8ac1af4999
1 parent
1f3a4c22
Exists in
master
and in
22 other branches
ActionItem1167: hide not informed city and state
Showing
2 changed files
with
5 additions
and
3 deletions
Show diff stats
app/controllers/public/contact_controller.rb
| @@ -10,8 +10,8 @@ class ContactController < PublicController | @@ -10,8 +10,8 @@ class ContactController < PublicController | ||
| 10 | if request.post? && params[self.icaptcha_field].blank? | 10 | if request.post? && params[self.icaptcha_field].blank? |
| 11 | @contact = Contact.new(params[:contact]) | 11 | @contact = Contact.new(params[:contact]) |
| 12 | @contact.dest = profile | 12 | @contact.dest = profile |
| 13 | - @contact.city = (!params[:city].blank? && City.exists?(params[:city])) ? City.find(params[:city]).name : _('Missing') | ||
| 14 | - @contact.state = (!params[:state].blank? && State.exists?(params[:state])) ? State.find(params[:state]).name : _('Missing') | 13 | + @contact.city = (!params[:city].blank? && City.exists?(params[:city])) ? City.find(params[:city]).name : nil |
| 14 | + @contact.state = (!params[:state].blank? && State.exists?(params[:state])) ? State.find(params[:state]).name : nil | ||
| 15 | if @contact.deliver | 15 | if @contact.deliver |
| 16 | flash[:notice] = _('Contact successfully sent') | 16 | flash[:notice] = _('Contact successfully sent') |
| 17 | redirect_to :action => 'new' | 17 | redirect_to :action => 'new' |
app/views/contact/sender/mail.rhtml
| 1 | <%= _('Name: %s') % @name %> | 1 | <%= _('Name: %s') % @name %> |
| 2 | <%= _('e-Mail: %s') % @email %> | 2 | <%= _('e-Mail: %s') % @email %> |
| 3 | -<%= _('City and state: %s-%s') % [@city, @state] %> | 3 | +<% if @city || @state %> |
| 4 | + <%= _('City and state: %s/%s') % [@city || '?', @state || '?'] %> | ||
| 5 | +<% end %> | ||
| 4 | 6 | ||
| 5 | <%= _('Message:') %> | 7 | <%= _('Message:') %> |
| 6 | -- | 8 | -- |