Download as
Browse Code »

Commit 807a7dc5bfc659958e9a4fe678d1e8a8b4d61bcf

Authored by JoenioCosta
1 parent 2cd58cb9
Exists in staging and in 42 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, tasks_keep_filter_params, user_mention, webfinger_server

ActionItem556: show display_name instead of name 

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@2284 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 4 changed files with 19 additions and 2 deletions   Show diff stats
app/models/profile.rb
  Diff comments   View file @807a7dc
... ... @@ -161,6 +161,8 @@ class Profile < ActiveRecord::Base
161 161 validates_exclusion_of :identifier, :in => RESERVED_IDENTIFIERS
162 162 validates_uniqueness_of :identifier
163 163  
  164 + validates_length_of :nickname, :maximum => 16, :allow_nil => true
  165 +
164 166 before_create :set_default_environment
165 167 def set_default_environment
166 168 if self.environment.nil?
... ... @@ -191,7 +193,7 @@ class Profile < ActiveRecord::Base
191 193 true
192 194 end
193 195  
194   - xss_terminate :only => [ :name, :address, :contact_phone ]
  196 + xss_terminate :only => [ :name, :nickname, :address, :contact_phone ]
195 197  
196 198 # returns the contact email for this profile. By default returns the the
197 199 # e-mail of the owner user.
... ... @@ -391,4 +393,12 @@ class Profile < ActiveRecord::Base
391 393 TinyMceArticle.new(attrs)
392 394 end
393 395  
  396 + def display_name
  397 + if self[:nickname].blank?
  398 + self.name
  399 + else
  400 + self[:nickname]
  401 + end
  402 + end
  403 +
394 404 end
... ...
app/views/blocks/profile_info.rhtml
  Diff comments   View file @807a7dc
1 1 <div class="vcard">
2 2  
3   -<h2 class="<%= profile.class == Person ? 'fn' : 'org' %>"><%= block.owner.name %></h2>
  3 +<h2 class="<%= profile.class == Person ? 'fn' : 'org' %>"><%= block.owner.display_name %></h2>
4 4  
5 5 <div class="profile-info-picture">
6 6 <div class="profile-info-picture-inner1">
... ...
app/views/profile_editor/_organization.rhtml
  Diff comments   View file @807a7dc
  1 + <div class="formfieldline">
  2 + <label class="formlabel" for="profile_data_nickname"><%= _('Display name') %></label>
  3 + <div class="formfield type-text">
  4 + <%= text_field_tag 'profile_data[nickname]', @profile_data.nickname, :id => 'profile_data_nickname', :size => 30, :maxlength => 16 %>
  5 + </div>
  6 + </div>
1 7 <%= f.text_field(:acronym) %>
2 8 <%= f.text_field(:foundation_year) %>
3 9 <%= f.text_field(:contact_person) %>
... ...
app/views/profile_editor/_person.rhtml
  Diff comments   View file @807a7dc
  1 + <%= f.text_field(:nickname, :maxlength => 16, :size => 30) %>
1 2 <%= f.text_field(:name) %>
2 3 <%= f.text_field(:contact_information) %>
3 4 <%= f.text_field(:contact_phone) %>
... ...