join_button: removing footer content from model

- leaving code to be displayed on views (MVC) (ActionItem2844)

join_button: removing footer content from model
- leaving code to be displayed on views (MVC) (ActionItem2844)
Daniela Feitosa
1 parent 2de692cd
Showing 5 changed files with 16 additions and 21 deletions Show diff stats
app/models/members_block.rb
app/models/profile_list_block.rb
app/views/blocks/members.rhtml
app/views/blocks/profile_info_actions/_join_leave_community.rhtml
test/unit/members_block_test.rb
@@ -15,15 +15,10 @@ class MembersBlock &lt; ProfileListBlock
   def footer
     profile = self.owner
-    show_button_block = show_join_leave_button
+    s = show_join_leave_button
     lambda do
-      if show_button_block
-        @view_all = link_to _('View all'), :profile => profile.identifier, :controller => 'profile', :action => 'members'
-        render "blocks/profile_info_actions/join_leave_community"
-      else
-        link_to _('View all'), :profile => profile.identifier, :controller => 'profile', :action => 'members'
-      end
+      render :file => 'blocks/members', :locals => { :profile => profile, :show_join_leave_button => s}
     end
   end
@@ -41,4 +36,4 @@ class MembersBlock &lt; ProfileListBlock
     }
   end
-end
 \ No newline at end of file
+end
@@ -62,7 +62,7 @@ class ProfileListBlock &lt; Block
     title.gsub('{#}', profile_count.to_s)
   end
-  # override in subclasses! See MembersBlock for exemple
+  # override in subclasses! See MembersBlock for example
   def extra_option
     {}
   end
@@ -0,0 +1,5 @@
+<%= link_to _('View all'), :profile => profile.identifier, :controller => 'profile', :action => 'members' %>
+
+<% if show_join_leave_button %>
+  <%= render :partial => 'blocks/profile_info_actions/join_leave_community' %>
+<% end %>
-<%= @view_all unless @view_all.nil? %>
-
 <% if logged_in? %>
   <% if profile.members.include?(user) %>
     <%= button(:delete, content_tag('span', __('Leave community')), profile.leave_url,
@@ -26,4 +24,4 @@
   <%= link_to content_tag('span', _('Join')), profile.join_not_logged_url,
     :class => 'button with-text icon-add',
     :title => _('Join this community') %>
-<% end %>
 \ No newline at end of file
+<% end %>
@@ -14,16 +14,13 @@ class MembersBlockTest &lt; ActiveSupport::TestCase
     assert_not_equal ProfileListBlock.new.default_title, MembersBlock.new.default_title
   end
-  should 'link to "all members" page' do
-    profile = create_user('mytestuser').person
-    block = MembersBlock.new
-    block.box = profile.boxes.first
-    block.save!
-
-    expects(:_).with('View all').returns('View all')
-    expects(:link_to).with('View all' , :profile => 'mytestuser', :controller => 'profile', :action => 'members').returns('link-to-members')
+  should 'display members file' do
+    community = fast_create(Community)
+    block = MembersBlock.create
+    block.expects(:owner).returns(community)
-    assert_equal 'link-to-members', instance_eval(&block.footer)
+    self.expects(:render).with(:file => 'blocks/members', :locals => { :profile => community, :show_join_leave_button => false}).returns('file-with-members-list')
+    assert_equal 'file-with-members-list', instance_eval(&block.footer)
   end
   should 'pick random members' do
	@@ -62,7 +62,7 @@ class ProfileListBlock < Block		@@ -62,7 +62,7 @@ class ProfileListBlock < Block
62	title.gsub('{#}', profile_count.to_s)	62	title.gsub('{#}', profile_count.to_s)
63	end	63	end
64		64
65	- # override in subclasses! See MembersBlock for exemple	65	+ # override in subclasses! See MembersBlock for example
66	def extra_option	66	def extra_option
67	{}	67	{}
68	end	68	end
@@ -0,0 +1,5 @@		@@ -0,0 +1,5 @@
	1	+<%= link_to _('View all'), :profile => profile.identifier, :controller => 'profile', :action => 'members' %>
	2	+
	3	+<% if show_join_leave_button %>
	4	+ <%= render :partial => 'blocks/profile_info_actions/join_leave_community' %>
	5	+<% end %>