Download as
Browse Code »

Commit b5fbc8bbb86cb43ce2e6b4b178ec9508dcee8da0

Authored by Moises Machado
Committed by Antonio Terceiro
1 parent 2b7a67f9
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

ActionItem1160: nickname cant be optional for communities 

* this is because of the identifier thats derived from the nickname becouse of ActionItem1126
Showing 3 changed files with 0 additions and 15 deletions   Show diff stats
app/models/community.rb
  Diff comments   View file @b5fbc8b
... ... @@ -9,7 +9,6 @@ class Community < Organization
9 9  
10 10 FIELDS = %w[
11 11 description
12   - nickname
13 12 language
14 13 ]
15 14  
... ...
app/views/shared/_custom_fields.rhtml
  Diff comments   View file @b5fbc8b
1 1 <% if profile.community? %>
2   - <%= optional_field(profile, 'nickname', labelled_form_field(_('Display name'), text_field(object_name, :nickname) + '&nbsp;' + content_tag('em', _('A short name by which the organization is know.'))), only_required) %>
3 2 <%= optional_field(profile, 'description', f.text_area(:description, :rows => 5)) %>
4 3 <%= optional_field(profile, 'language', f.text_field(:language), only_required) %>
5 4 <% end %>
... ...
test/functional/profile_editor_controller_test.rb
  Diff comments   View file @b5fbc8b
... ... @@ -797,17 +797,4 @@ class ProfileEditorControllerTest &lt; Test::Unit::TestCase
797 797 end
798 798 end
799 799  
800   - should 'display nickname field only if active when edit community' do
801   - community = Community.create(:name => 'test_profile')
802   - Environment.any_instance.stubs(:required_community_fields).returns([])
803   -
804   - Environment.any_instance.stubs(:active_community_fields).returns(['description'])
805   - get :edit, :profile => community.identifier
806   - assert_no_tag :tag => 'input', :attributes => { :name => "profile_data[nickname]" }
807   -
808   - Environment.any_instance.stubs(:active_community_fields).returns(['nickname'])
809   - get :edit, :profile => community.identifier
810   - assert_tag :tag => 'input', :attributes => { :name => "profile_data[nickname]" }
811   - end
812   -
813 800 end
... ...