X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/9d35062ba3013891e44265261eaa1111ab1ebc47..a6f45adede24e47b113dcf0f33e701478076f1b7:/app/views/user/view.html.erb
diff --git a/app/views/user/view.html.erb b/app/views/user/view.html.erb
index 77ad06a8f..4d3d7c0c2 100644
--- a/app/views/user/view.html.erb
+++ b/app/views/user/view.html.erb
@@ -25,6 +25,8 @@
|
<%= link_to t('user.view.my traces'), :controller => 'trace', :action=>'mine' %>
|
+ <%= link_to t('user.view.my bugs'), :controller => 'map_bugs', :action=>'my_bugs' %>
+ |
<%= link_to t('user.view.my settings'), :controller => 'user', :action => 'account', :display_name => @user.display_name %>
|
<%= link_to t('user.view.oauth settings'), :controller => 'oauth_clients', :action => 'index' %>
@@ -43,6 +45,8 @@
|
<%= link_to t('user.view.traces'), :controller => 'trace', :action => 'view', :display_name => @this_user.display_name %>
|
+ <%= link_to t('user.view.bugs'), :controller => 'map_bugs', :action=>'my_bugs' %>
+ |
<% if @user and @user.is_friends_with?(@this_user) %>
<%= link_to t('user.view.remove as friend'), :controller => 'user', :action => 'remove_friend', :display_name => @this_user.display_name %>
<% else %>
@@ -59,19 +63,20 @@
<% end %>
<% if @user and @user.administrator? %>
- <% if @this_user.active? %>
- <%= link_to t('user.view.deactivate_user'), {:controller => 'user', :action => 'deactivate', :display_name => @this_user.display_name}, {:confirm => t('user.view.confirm')} %>
- <% else %>
- <%= link_to t('user.view.activate_user'), {:controller => 'user', :action => 'activate', :display_name => @this_user.display_name}, {:confirm => t('user.view.confirm')} %>
+ <% if ["active", "confirmed"].include? @this_user.status %>
+ <%= link_to t('user.view.deactivate_user'), {:controller => 'user', :action => 'set_status', :status => 'pending', :display_name => @this_user.display_name}, {:confirm => t('user.view.confirm')} %> |
+ <% elsif ["pending"].include? @this_user.status %>
+ <%= link_to t('user.view.activate_user'), {:controller => 'user', :action => 'set_status', :status => 'active', :display_name => @this_user.display_name}, {:confirm => t('user.view.confirm')} %> |
<% end %>
- |
- <% if @this_user.visible? %>
- <%= link_to t('user.view.hide_user'), {:controller => 'user', :action => 'hide', :display_name => @this_user.display_name}, {:confirm => t('user.view.confirm')} %>
- |
- <%= link_to t('user.view.delete_user'), {:controller => 'user', :action => 'delete', :display_name => @this_user.display_name}, {:confirm => t('user.view.confirm')} %>
+ <% if ["active", "suspended"].include? @this_user.status %>
+ <%= link_to t('user.view.confirm_user'), {:controller => 'user', :action => 'set_status', :status => 'confirmed', :display_name => @this_user.display_name}, {:confirm => t('user.view.confirm')} %> |
+ <% end %>
+ <% if ["pending", "active", "confirmed", "suspended"].include? @this_user.status %>
+ <%= link_to t('user.view.hide_user'), {:controller => 'user', :action => 'set_status', :status => 'deleted', :display_name => @this_user.display_name}, {:confirm => t('user.view.confirm')} %> |
<% else %>
- <%= link_to t('user.view.unhide_user'), {:controller => 'user', :action => 'unhide', :display_name => @this_user.display_name}, {:confirm => t('user.view.confirm')} %>
+ <%= link_to t('user.view.unhide_user'), {:controller => 'user', :action => 'set_status', :status => 'active', :display_name => @this_user.display_name}, {:confirm => t('user.view.confirm')} %> |
<% end %>
+ <%= link_to t('user.view.delete_user'), {:controller => 'user', :action => 'delete', :display_name => @this_user.display_name}, {:confirm => t('user.view.confirm')} %>
<% end %>
@@ -80,6 +85,8 @@
<% if @user and @user.administrator? %>
<%= t 'user.view.email address' %> <%= @this_user.email %>
<%= t 'user.view.created from' %> <%= @this_user.creation_ip %>
+<%= t 'user.view.status' %> <%= @this_user.status.capitalize %>
+<%= t 'user.view.spam score' %> <%= @this_user.spam_score %>
<% end %><%= t 'user.view.if set location', :settings_link => (link_to t('user.view.settings_link_text'), :controller => 'user', :action => 'account', :display_name => @user.display_name) %>
<% else %> - <%= render :partial => 'map' %> + <%= render :partial => 'map', :locals => { :setting_location => false, :show_other_users => true } %> <% end %>