Download as
Browse Code »

Commit 843c5cb9b484fc7637f7e586e5b4b1cccac4e463

Authored by JoenioCosta
1 parent 9bd978a4
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

ActionItem376: showing created at on manage groups 

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1778 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 2 changed files with 15 additions and 1 deletions   Show diff stats
app/views/memberships/index.rhtml
  Diff comments   View file @843c5cb
@@ -10,13 +10,15 @@ @@ -10,13 +10,15 @@
10 <th><%= _('Name') %></th> 10 <th><%= _('Name') %></th>
11 <th><%= _('Type') %></th> 11 <th><%= _('Type') %></th>
12 <th><%= _('Members') %></th> 12 <th><%= _('Members') %></th>
  13 + <th><%= _('Created at') %></th>
13 <th><%= _('Actions') %></th> 14 <th><%= _('Actions') %></th>
14 </tr> 15 </tr>
15 <% for membership in @memberships %> 16 <% for membership in @memberships %>
16 <tr> 17 <tr>
17 <td><%= link_to membership.name, membership.url %></td> 18 <td><%= link_to membership.name, membership.url %></td>
18 <td><%= _(membership.class.name) %></td> 19 <td><%= _(membership.class.name) %></td>
19 - <td><%= _(membership.members.size.to_s) %></td> 20 + <td><%= membership.members.size.to_s %></td>
  21 + <td><%= show_date(membership.created_at) %></td>
20 <td> 22 <td>
21 <%= link_to _('Manage'), membership.admin_url %> 23 <%= link_to _('Manage'), membership.admin_url %>
22 </td> 24 </td>
test/functional/memberships_controller_test.rb
  Diff comments   View file @843c5cb
1 require File.dirname(__FILE__) + '/../test_helper' 1 require File.dirname(__FILE__) + '/../test_helper'
2 require 'memberships_controller' 2 require 'memberships_controller'
3 3
  4 +
4 # Re-raise errors caught by the controller. 5 # Re-raise errors caught by the controller.
5 class MembershipsController; def rescue_action(e) raise e end; end 6 class MembershipsController; def rescue_action(e) raise e end; end
6 7
7 class MembershipsControllerTest < Test::Unit::TestCase 8 class MembershipsControllerTest < Test::Unit::TestCase
  9 +
  10 + include ApplicationHelper
8 11
9 def setup 12 def setup
10 @controller = MembershipsController.new 13 @controller = MembershipsController.new
@@ -90,4 +93,13 @@ class MembershipsControllerTest &lt; Test::Unit::TestCase @@ -90,4 +93,13 @@ class MembershipsControllerTest &lt; Test::Unit::TestCase
90 assert_tag :tag => 'td', :content => '1' 93 assert_tag :tag => 'td', :content => '1'
91 end 94 end
92 95
  96 + should 'show created at on list' do
  97 + community = Community.create!(:name => 'my test community')
  98 + community.add_member(profile)
  99 + created = show_date(community.created_at)
  100 + get :index, :profile => profile.identifier
  101 + assert_tag :tag => 'th', :content => 'Created at'
  102 + assert_tag :tag => 'td', :content => created
  103 + end
  104 +
93 end 105 end