Download as
Browse Code »

Commit cd4a78e99e167059fefc012fcc8944bd2ac1190a

Authored by JoenioCosta
1 parent 843c5cb9
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

ActionItem376: showing description of communities 

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1779 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 2 changed files with 23 additions and 18 deletions   Show diff stats
app/views/memberships/index.rhtml
  Diff comments   View file @cd4a78e
... ... @@ -4,23 +4,17 @@
4 4 <%= _('%s is a member of the following groups:') % profile.name %>
5 5 </p>
6 6  
7   -
8 7 <table>
9   - <tr>
10   - <th><%= _('Name') %></th>
11   - <th><%= _('Type') %></th>
12   - <th><%= _('Members') %></th>
13   - <th><%= _('Created at') %></th>
14   - <th><%= _('Actions') %></th>
15   - </tr>
16 8 <% for membership in @memberships %>
17 9 <tr>
18   - <td><%= link_to membership.name, membership.url %></td>
19   - <td><%= _(membership.class.name) %></td>
20   - <td><%= membership.members.size.to_s %></td>
21   - <td><%= show_date(membership.created_at) %></td>
  10 + <td> <%= image_tag(profile_icon(membership)) %> </td>
22 11 <td>
23   - <%= link_to _('Manage'), membership.admin_url %>
  12 + <%= _('Name: %s:') % link_to(membership.name, membership.url) %> <br/>
  13 + <%= _('Type: %s') % _(membership.class.name) %> <br/>
  14 + <%= _('Description: %s') % membership.description + '<br/>' if membership.kind_of?(Community) %>
  15 + <%= _('Members: %s') % membership.members.size.to_s %> <br/>
  16 + <%= _('Created at: %s') % show_date(membership.created_at) %> <br/>
  17 + <%= _('Actions: %s') % link_to(_('Manage'), membership.admin_url) %> <br/>
24 18 </td>
25 19 </tr>
26 20 <% end %>
... ...
test/functional/memberships_controller_test.rb
  Diff comments   View file @cd4a78e
... ... @@ -89,17 +89,28 @@ class MembershipsControllerTest &lt; Test::Unit::TestCase
89 89 community = Community.create!(:name => 'my test community')
90 90 community.add_member(profile)
91 91 get :index, :profile => profile.identifier
92   - assert_tag :tag => 'th', :content => 'Members'
93   - assert_tag :tag => 'td', :content => '1'
  92 + assert_tag :tag => 'td', :content => /Members: 1/
94 93 end
95 94  
96 95 should 'show created at on list' do
97 96 community = Community.create!(:name => 'my test community')
98 97 community.add_member(profile)
99   - created = show_date(community.created_at)
100 98 get :index, :profile => profile.identifier
101   - assert_tag :tag => 'th', :content => 'Created at'
102   - assert_tag :tag => 'td', :content => created
  99 + assert_tag :tag => 'td', :content => /Created at: #{show_date(community.created_at)}/
  100 + end
  101 +
  102 + should 'show description on list' do
  103 + community = Community.create!(:name => 'my test community', :description => 'description test')
  104 + community.add_member(profile)
  105 + get :index, :profile => profile.identifier
  106 + assert_tag :tag => 'td', :content => /Description: description test/
  107 + end
  108 +
  109 + should 'not show description to enterprises on list' do
  110 + enterprise = Enterprise.create!(:identifier => 'enterprise-test', :name => 'my test enterprise')
  111 + enterprise.add_member(profile)
  112 + get :index, :profile => profile.identifier
  113 + assert_no_tag :tag => 'td', :content => /Description:/
103 114 end
104 115  
105 116 end
... ...