Download as
Browse Code »

Commit ef7c2df9366c906d61b4c7b06d205d6b2cf8fd52

Authored by Arthur Esposte
Committed by Luciano Prestes
1 parent 7863adab
Exists in staging and in 41 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, user_mention, webfinger_server

Fix broken functional tests when dont have user. 

Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>
Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>
Signed-off-by: Thiago Ribeiro <thiagitosouza@gmail.com>
Showing 2 changed files with 8 additions and 9 deletions   Show diff stats
app/views/profile_editor/_person.html.erb
  Diff comments   View file @ef7c2df
@@ -18,6 +18,14 @@ @@ -18,6 +18,14 @@
18 18
19 <%= @plugins.dispatch(:profile_info_extra_contents).collect { |content| instance_exec(&content) }.join("") %> 19 <%= @plugins.dispatch(:profile_info_extra_contents).collect { |content| instance_exec(&content) }.join("") %>
20 20
  21 + <div class="formfieldline">
  22 + <%= label_tag("private_token", _("Private Token")) %>
  23 + <div class="formfield type-text">
  24 + <%= text_field_tag("a", @profile.user.private_token, :size => 30) %>
  25 + </div>
  26 + </div>
  27 + <%= link_to("Reset token", {:controller => :profile_editor, :action => :reset_private_token, :id => @profile.id}, :class => "button with-text") %>
  28 +
21 <%= render :partial => 'person_form', :locals => {:f => f} %> 29 <%= render :partial => 'person_form', :locals => {:f => f} %>
22 30
23 <h2><%= _('Notification options') %></h2> 31 <h2><%= _('Notification options') %></h2>
app/views/profile_editor/_person_form.html.erb
  Diff comments   View file @ef7c2df
1 <% @person ||= @profile %> 1 <% @person ||= @profile %>
2 2
3 -<div class="formfieldline">  
4 - <%= label_tag("private_token", _("Private Token")) %>  
5 - <div class="formfield type-text">  
6 - <%= text_field_tag("a", @profile.user.private_token, :size => 30) %>  
7 - </div>  
8 -</div>  
9 -  
10 -<%= link_to("Reset token", {:controller => :profile_editor, :action => :reset_private_token, :id => @person.id}, :class => "button with-text") %>  
11 -  
12 <% optional_field(@person, 'nickname') do %> 3 <% optional_field(@person, 'nickname') do %>
13 <%= f.text_field(:nickname, :maxlength => 16, :size => 30, :rel => _('Nickname')) %> 4 <%= f.text_field(:nickname, :maxlength => 16, :size => 30, :rel => _('Nickname')) %>
14 <div> 5 <div>