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

Use a current_user helper for accessing the logged in user in all views.

Browse source
This commit is contained in:
Andy Allan 2017-07-26 11:54:31 +01:00
parent 41000078b9
commit c819bec8b7
31 changed files with 99 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/views/message/_message_count.html.erb
View file

@ -1,8 +1,8 @@
<p id="inbox-count">
<%= t "message.inbox.messages",
:new_messages => t("message.inbox.new_messages",
:count => @user.new_messages.size),
:old_messages => t("message.inbox.old_messages",
:count => @user.messages.size - @user.new_messages.size)
:new_messages => t("message.inbox.new_messages",
:count => current_user.new_messages.size),
:old_messages => t("message.inbox.old_messages",
:count => current_user.messages.size - current_user.new_messages.size)
%>
</p>
</p>

8
app/views/message/inbox.html.erb
View file

@ -1,10 +1,10 @@
<% content_for :heading do %>
<h2><%= t'message.inbox.my_inbox'%>/<%= link_to t('message.inbox.outbox'), outbox_path(@user.display_name) %></h2>
<h2><%= t'message.inbox.my_inbox'%>/<%= link_to t('message.inbox.outbox'), outbox_path(current_user.display_name) %></h2>
<% end %>
<h4><%= render :partial => "message_count" %></h4>
<% if @user.messages.size > 0 %>
<% if current_user.messages.size > 0 %>
<table class="messages">
<thead>
<tr>
@ -16,9 +16,9 @@
</tr>
</thead>
<tbody>
<%= render :partial => "message_summary", :collection => @user.messages %>
<%= render :partial => "message_summary", :collection => current_user.messages %>
</tbody>
</table>
<% else %>
<div><%= raw(t'message.inbox.no_messages_yet', :people_mapping_nearby_link => link_to(t('message.inbox.people_mapping_nearby'), :controller => 'user', :action => 'view', :display_name => @user.display_name)) %></div>
<div><%= raw(t'message.inbox.no_messages_yet', :people_mapping_nearby_link => link_to(t('message.inbox.people_mapping_nearby'), :controller => 'user', :action => 'view', :display_name => current_user.display_name)) %></div>
<% end %>

2
app/views/message/new.html.erb
View file

@ -16,7 +16,7 @@
</div>
<div class='buttons'>
<%= submit_tag t('message.new.send_button') %>
<%= link_to t('message.new.back_to_inbox'), { :controller => 'message', :action => 'inbox', :display_name => @user.display_name }, :class => 'deemphasize button' %>
<%= link_to t('message.new.back_to_inbox'), { :controller => 'message', :action => 'inbox', :display_name => current_user.display_name }, :class => 'deemphasize button' %>
</div>
</fieldset>
<% end %>

10
app/views/message/outbox.html.erb
View file

@ -1,10 +1,10 @@
<% content_for :heading do %>
<h2><%= raw(t'message.outbox.my_inbox', :inbox_link => link_to(t('message.outbox.inbox'), inbox_path(@user.display_name))) %>/<%= t'message.outbox.outbox' %></h2>
<h2><%= raw(t'message.outbox.my_inbox', :inbox_link => link_to(t('message.outbox.inbox'), inbox_path(current_user.display_name))) %>/<%= t'message.outbox.outbox' %></h2>
<% end %>
<h4><%= t'message.outbox.messages', :count => @user.sent_messages.size %></h4>
<h4><%= t'message.outbox.messages', :count => current_user.sent_messages.size %></h4>
<% if @user.sent_messages.size > 0 %>
<% if current_user.sent_messages.size > 0 %>
<table class="messages">
<thead>
<tr>
@ -15,9 +15,9 @@
</tr>
</thead>
<tbody>
<%= render :partial => "sent_message_summary", :collection => @user.sent_messages %>
<%= render :partial => "sent_message_summary", :collection => current_user.sent_messages %>
</tbody>
</table>
<% else %>
<div class="messages"><%= raw(t'message.outbox.no_sent_messages', :people_mapping_nearby_link => link_to(t('message.outbox.people_mapping_nearby'), :controller => 'user', :action => 'view', :display_name => @user.display_name)) %></div>
<div class="messages"><%= raw(t'message.outbox.no_sent_messages', :people_mapping_nearby_link => link_to(t('message.outbox.people_mapping_nearby'), :controller => 'user', :action => 'view', :display_name => current_user.display_name)) %></div>
<% end %>

4
app/views/message/read.html.erb
View file

@ -1,4 +1,4 @@
<% if @user == @message.recipient %>
<% if current_user == @message.recipient %>
<% content_for :heading do %>
<h2><%= h(@message.title) %></h2>
<% end %>
@ -36,5 +36,5 @@
<% end %>
<%= link_to t('message.read.back'), {:controller => 'message', :action => 'outbox', :display_name => @user.display_name }, :class => "button deemphasize" %>
<%= link_to t('message.read.back'), {:controller => 'message', :action => 'outbox', :display_name => current_user.display_name }, :class => "button deemphasize" %>
</div>