Merge branch 'master' into api

Antonio Terceiro
2 parents db0d70fc c9e090d9
Showing 16 changed files with 256 additions and 124 deletions Show diff stats
app/controllers/public/content_viewer_controller.rb
app/controllers/public/profile_controller.rb
app/models/profile.rb
app/views/profile/_profile_members_list.html.erb
app/views/profile/members.html.erb
lib/authenticated_system.rb
plugins/people_block/controllers/people_block_plugin_profile_controller.rb
plugins/people_block/test/functional/people_block_plugin_profile_controller_test.rb
plugins/people_block/test/unit/members_block_test.rb
plugins/people_block/views/blocks/members.html.erb
public/designs/themes/base/style.scss
public/javascripts/members_page.js
public/stylesheets/application.scss
test/functional/application_controller_test.rb
test/functional/content_viewer_controller_test.rb
test/functional/profile_controller_test.rb
@@ -8,6 +8,7 @@ class ContentViewerController &lt; ApplicationController
   helper TagsHelper
   def view_page
+
     path = get_path(params[:page], params[:format])
     @version = params[:version].to_i
@@ -38,7 +39,7 @@ class ContentViewerController &lt; ApplicationController
     end
     # At this point the page will be showed
-    @page.hit unless user_is_a_bot?
+    @page.hit unless user_is_a_bot? || already_visited?(@page)
     @page = FilePresenter.for @page
@@ -272,4 +273,18 @@ class ContentViewerController &lt; ApplicationController
     @comment_order = params[:comment_order].nil? ? 'oldest' : params[:comment_order]
   end
+  private
+
+  def already_visited?(element)
+    user_id = if user.nil? then -1 else current_user.id end
+    user_id = "#{user_id}_#{element.id}_#{element.class}"
+
+    if cookies.signed[:visited] == user_id
+      return true
+    else
+      cookies.permanent.signed[:visited] = user_id
+      return false
+    end
+  end
+
 end
@@ -66,7 +66,10 @@ class ProfileController &lt; PublicController
   def members
     if is_cache_expired?(profile.members_cache_key(params))
-      @members = profile.members_by_name.includes(relations_to_include).paginate(:per_page => members_per_page, :page => params[:npage], :total_entries => profile.members.count)
+      sort = (params[:sort] == 'desc') ? params[:sort] : 'asc'
+      @profile_admins = profile.admins.includes(relations_to_include).order("name #{sort}").paginate(:per_page => members_per_page, :page => params[:npage])
+      @profile_members = profile.members.includes(relations_to_include).order("name #{sort}").paginate(:per_page => members_per_page, :page => params[:npage])
+      @profile_members_url = url_for(:controller => 'profile', :action => 'members')
     end
   end
@@ -957,7 +957,8 @@ private :generate_url, :url_options
   def members_cache_key(params = {})
     page = params[:npage] || '1'
-    cache_key + '-members-page-' + page
+    sort = (params[:sort] ==  'desc') ? params[:sort] : 'asc'
+    cache_key + '-members-page-' + page + '-' + sort
   end
   def more_recent_label
@@ -0,0 +1,16 @@
+<div id="profile-members-sort-options">
+  <%= label_tag("sort-#{role}", _("Sort by:")) %>
+  <%= select_tag("sort-#{role}",
+    options_for_select([
+      [_("Name A-Z"), 'asc'],
+      [_("Name Z-A"), 'desc'],
+    ], :selected => params[:sort])
+  ) %>
+</div>
+<ul class="profile-list-<%= role %>" >
+  <% users.each do |u| %>
+    <%= profile_image_link(u) %>
+  <% end %>
+</ul>
+
+<%= pagination_links users, :param_name => 'npage' %>
 <div class="common-profile-list-block">
-<h1><%= _("%s's members") % profile.name %></h1>
+<h1><%= _("Members (%d)") % @profile_members.total_entries %></h1>
+<h2 class="community-name"><%= profile.name %></h2>
 <% cache_timeout(profile.members_cache_key(params), 4.hours) do %>
-  <ul class='profile-list'>
-    <% @members.each do |member| %>
-      <%= profile_image_link(member) %>
-    <% end %>
-  </ul>
+  <div class="profile-members-tabs-container">
+    <% tabs = [] %>
+
+    <% div_members = content_tag :div, :class => "profile-members" do
+      render :partial => 'profile_members_list',
+                            :locals => {
+                            :users => @profile_members,
+                            :role => "members"
+                            }
+    end %>
+
+    <% tabs << {:title =>  _("%d Members") % @profile_members.total_entries,
+                     :id => "members-tab",
+                     :content => div_members
+                     } %>
-  <div id='pagination-profiles'>
-    <%= pagination_links @members, :param_name => 'npage' %>
-  </div>
+    <% div_admins = content_tag :div, :class => "profile-admins" do
+      render :partial => 'profile_members_list',
+                            :locals => {
+                            :users => @profile_admins,
+                            :role => "admins"
+                            }
+    end %>
+
+    <% tabs << {:title => _("%d Administrators") % @profile_admins.total_entries,
+                            :id => "admins-tab",
+                            :content => div_admins
+                            } %>
+
+    <%= render_tabs(tabs) %>
+  </div><!-- end of class="profile-members-tabs-container" -->
 <% end %>
 <% button_bar do %>
@@ -26,4 +49,7 @@
   <% end %>
 <% end %>
-</div><!-- fim class="common-profile-list-block" -->
+<%= hidden_field_tag "profile_url", @profile_members_url %>
+</div><!-- end of class="common-profile-list-block" -->
+
+<%= javascript_include_tag "members_page.js" %>
@@ -2,17 +2,21 @@ module AuthenticatedSystem
   protected
-    # See impl. from http://stackoverflow.com/a/2513456/670229
-    def self.included? base
-      base.around_filter do
+    def self.included base
+      # See impl. from http://stackoverflow.com/a/2513456/670229
+      base.around_filter do |&block|
         begin
           User.current = current_user
-          yield
+          block.call
         ensure
           # to address the thread variable leak issues in Puma/Thin webserver
           User.current = nil
         end
       end
+
+      # Inclusion hook to make #current_user and #logged_in?
+      # available as ActionView helper methods.
+      base.send :helper_method, :current_user, :logged_in?
     end
     # Returns true or false if the user is logged in.
@@ -134,12 +138,6 @@ module AuthenticatedSystem
       end
     end
-    # Inclusion hook to make #current_user and #logged_in?
-    # available as ActionView helper methods.
-    def self.included(base)
-      base.send :helper_method, :current_user, :logged_in?
-    end
-
     # When called with before_filter :login_from_cookie will check for an :auth_token
     # cookie and log the user back in if apropriate
     def login_from_cookie
@@ -1,20 +0,0 @@
-class PeopleBlockPluginProfileController < ProfileController
-
-  append_view_path File.join(File.dirname(__FILE__) + '/../views')
-
-  def members
-    if is_cache_expired?(profile.members_cache_key(params))
-      unless params[:role_key].blank?
-        role = Role.find_by_key_and_environment_id(params[:role_key], profile.environment)
-        @members = profile.members.with_role(role.id)
-        @members_title = role.name
-      else
-        @members = profile.members
-        @members_title = 'members'
-      end
-      @members = @members.includes(relations_to_include).paginate(:per_page => members_per_page, :page => params[:npage], :total_entries => @members.count)
-    end
-    render "profile/members"
-  end
-
-end
@@ -1,76 +0,0 @@
-require_relative '../test_helper'
-require_relative '../../controllers/people_block_plugin_profile_controller'
-
-
-# Re-raise errors caught by the controller.
-class PeopleBlockPluginProfileController; def rescue_action(e) raise e end; end
-
-class PeopleBlockPluginProfileControllerTest < ActionController::TestCase
-
-  def setup
-    @controller = PeopleBlockPluginProfileController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-
-    @profile = fast_create(Community)
-
-    @environment = @profile.environment
-    @environment.enabled_plugins = ['PeopleBlockPlugin']
-    @environment.save!
-
-    MembersBlock.delete_all
-    @block = MembersBlock.new
-    @block.box = @profile.boxes.first
-    @block.save!
-
-    @admin = create_user('adminprofile').person
-    @member = create_user('memberprofile').person
-    @moderator = create_user('moderatorprofile').person
-    @profile.add_moderator(@moderator)
-    @profile.add_member(@member)
-    @profile.add_admin(@admin)
-  end
-
-  attr_accessor :profile, :block, :admin, :member, :moderator
-
-  should 'list members without role_key' do
-    get :members, :profile => profile.identifier, :role_key => ""
-    assert_response :success
-    assert_template 'members'
-    assert_equivalent [@admin, @member, @moderator], assigns(:members)
-    assert_match /adminprofile/, @response.body
-    assert_match /memberprofile/, @response.body
-    assert_match /moderatorprofile/, @response.body
-  end
-
-  should 'list members with role_key=nil' do
-    get :members, :profile => profile.identifier, :role_key => nil
-    assert_response :success
-    assert_template 'members'
-    assert_equivalent [@admin, @member, @moderator], assigns(:members)
-    assert_match /adminprofile/, @response.body
-    assert_match /memberprofile/, @response.body
-    assert_match /moderatorprofile/, @response.body
-  end
-
-  should 'list members only' do
-    get :members, :profile => profile.identifier, :role_key => Profile::Roles.member(profile.environment.id).key
-    assert_response :success
-    assert_template 'members'
-    assert_equal [@member], assigns(:members)
-    assert_no_match /adminprofile/, @response.body
-    assert_match /memberprofile/, @response.body
-    assert_no_match /moderatorprofile/, @response.body
-  end
-
-  should 'list moderators only' do
-    get :members, :profile => profile.identifier, :role_key => Profile::Roles.moderator(profile.environment.id).key
-    assert_response :success
-    assert_template 'members'
-    assert_equal [@moderator], assigns(:members)
-    assert_no_match /adminprofile/, @response.body
-    assert_no_match /memberprofile/, @response.body
-    assert_match /moderatorprofile/, @response.body
-  end
-
-end
@@ -147,11 +147,11 @@ class MembersBlockTest &lt; ActionView::TestCase
     instance_eval(&block.footer)
     assert_select 'a.view-all' do |elements|
-      assert_select '[href=/profile/mytestuser/plugin/people_block/members]'
+      assert_select "[href=/profile/mytestuser/members#members-tab]"
     end
   end
-  should 'provide link to members page with a selected role' do
+  should 'provide link to members page when visible_role is profile_member' do
     profile = create_user('mytestuser').person
     block = MembersBlock.new
     block.box = profile.boxes.first
@@ -160,7 +160,33 @@ class MembersBlockTest &lt; ActionView::TestCase
     instance_eval(&block.footer)
     assert_select 'a.view-all' do |elements|
-      assert_select '[href=/profile/mytestuser/plugin/people_block/members?role_key=profile_member]'
+      assert_select '[href=/profile/mytestuser/members#members-tab]'
+    end
+  end
+
+  should 'provide link to members page when visible_role is profile_moderator' do
+    profile = create_user('mytestuser').person
+    block = MembersBlock.new
+    block.box = profile.boxes.first
+    block.visible_role = 'profile_moderator'
+    block.save!
+
+    instance_eval(&block.footer)
+    assert_select 'a.view-all' do |elements|
+      assert_select '[href=/profile/mytestuser/members#members-tab]'
+    end
+  end
+
+  should 'provide link to admins page when visible_role is profile_admin' do
+    profile = create_user('mytestuser').person
+    block = MembersBlock.new
+    block.box = profile.boxes.first
+    block.visible_role = 'profile_admin'
+    block.save!
+
+    instance_eval(&block.footer)
+    assert_select 'a.view-all' do |elements|
+      assert_select '[href=/profile/mytestuser/members#admins-tab]'
     end
   end
-<%= link_to c_('View all'), {:profile => profile.identifier, :controller => 'people_block_plugin_profile', :action => 'members', :role_key => role_key}, :class => 'view-all' %>
+<% anchor = role_key == "profile_admin" ? "admins-tab" : "members-tab" %>
+<%= link_to c_('View all'), {:profile => profile.identifier, :controller => 'profile', :action => 'members', :anchor =>anchor }, :class => 'view-all' %>
 <% if show_join_leave_button %>
   <%= render :partial => 'blocks/profile_info_actions/join_leave_community' %>
@@ -231,6 +231,10 @@ body, th, td, input {
   border-left: 0px;
 }
+.menu-submenu-list>li{
+  width: 100%;
+}
+
 #navigation .menu-submenu ul{
   border: 1px solid #888a85;
   border-top: 0px;
@@ -1534,3 +1538,7 @@ table#recaptcha_table tr:hover td {
   width: 494px;
   padding-left: 2px;
 }
+
+.profile-members-title-sort {
+  clear: both;
+}
@@ -0,0 +1,24 @@
+(function($) {
+  "use strict";
+
+  function set_members_sort() {
+    var profile_members_url = $("#profile_url").val();
+
+    $("#sort-members, #sort-admins").on("change", function() {
+      var sort_value = this.value;
+      var role = this.id;
+      role = role.replace("sort-", '');
+      var actual_page_content = $(".profile-list-"+role);
+
+      $.get(profile_members_url, {sort: sort_value}, function(response) {
+        var html_response = $(response);
+
+        actual_page_content.html(html_response.find(".profile-list-"+role).html());
+      });
+    });
+  }
+
+  $(document).ready(function() {
+    set_members_sort();
+  });
+}) (jQuery);
@@ -4777,6 +4777,11 @@ h1#agenda-title {
   background-image: url(../images/control-panel/role-management.gif)
 }
 /* ==> public/stylesheets/controller_profile_members.css <== */
+
+.profile-members-tabs-container .ui-corner-all {
+  overflow: auto;
+}
+
 .controller-profile_members .no-boxes {
   margin: 30px
 }
@@ -5432,6 +5437,7 @@ h1#agenda-title {
   margin: 0;
   padding: 0;
   width: 100%;
+  height: 92px;
 }
 #content .menu-submenu-content ul {
   margin: 0;
@@ -191,6 +191,16 @@ class ApplicationControllerTest &lt; ActionController::TestCase
     assert_tag :tag => 'option', :attributes => { :value => 'it' }, :content => 'Italiano'
   end
+  should 'set and unset the current user' do
+    testuser = create_user 'testuser'
+    login_as 'testuser'
+    User.expects(:current=).with do |user|
+      user == testuser
+    end.at_least_once
+    User.expects(:current=).with(nil).at_least_once
+    get :index
+  end
+
   should 'display link to webmail if enabled for system' do
     @controller.stubs(:get_layout).returns('application')
     login_as('ze')
@@ -1587,4 +1587,33 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
     assert_tag :tag => 'div', :attributes => { :class => 'article-compact-image' }
     assert_tag :tag => 'div', :attributes => { :class => 'article-compact-abstract-with-image' }
   end
+
+  should 'not count a visit twice for the same user' do
+    profile = create_user('someone').person
+    login_as(@profile.identifier)
+    page = profile.articles.build(:name => 'myarticle', :body => 'the body of the text')
+    page.save!
+
+    get :view_page, :profile => profile.identifier, :page => 'myarticle'
+    page.reload
+    assert_equal 1, page.hits
+
+    get :view_page, :profile => profile.identifier, :page => 'myarticle'
+    page.reload
+    assert_equal 1, page.hits
+  end
+
+  should 'not count a visit twice for unlogged users' do
+     profile = create_user('someone').person
+     page = profile.articles.build(:name => 'myarticle', :body => 'the body of the text')
+     page.save!
+
+     get :view_page, :profile => profile.identifier, :page => 'myarticle'
+     page.reload
+     assert_equal 1, page.hits
+
+     get :view_page, :profile => profile.identifier, :page => 'myarticle'
+     page.reload
+     assert_equal 1, page.hits
+  end
 end
@@ -55,7 +55,8 @@ class ProfileControllerTest &lt; ActionController::TestCase
     assert_response :success
     assert_template 'members'
-    assert assigns(:members)
+    assert assigns(:profile_members)
+    assert assigns(:profile_admins)
   end
   should 'list favorite enterprises' do
@@ -1747,4 +1748,68 @@ class ProfileControllerTest &lt; ActionController::TestCase
     assert_no_tag :tag => 'td', :descendant => { :tag => 'a', :content => /#{person.enterprises.count}/, :attributes => { :href => /profile\/#{person.identifier}\/enterprises$/ }}
   end
+  should 'admins from a community be present in admin users div and members div' do
+    community = fast_create(Community)
+    another_user = create_user('another_user').person
+
+    login_as(@profile.identifier)
+
+    community.add_admin(@profile)
+
+    assert community.admins.include? @profile
+    get :members, :profile => community.identifier
+
+    assert_tag :tag => 'ul', :attributes => { :class => /profile-list-admins/},
+      :descendant => { :tag => 'a', :attributes => { :title => "testuser" } }
+
+    assert_tag :tag => 'ul', :attributes => { :class => /profile-list-members/},
+      :descendant => { :tag => 'a', :attributes => { :title => "testuser" } }
+  end
+
+  should 'all members, except admins, be present in members div' do
+    community = fast_create(Community)
+    community.add_member(@profile)
+
+    another_user = create_user('another_user').person
+    community.add_member(another_user)
+
+    assert_equal false, community.admins.include?(another_user)
+
+    get :members, :profile => community.identifier
+
+    assert_tag :tag => 'ul', :attributes => { :class => /profile-list-members/},
+      :descendant => { :tag => 'a', :attributes => { :title => "another_user" } }
+
+    assert_no_tag :tag => 'ul', :attributes => { :class => /profile-list-admins/},
+    :descendant => { :tag => 'a', :attributes => { :title => "another_user" } }
+  end
+
+  should 'members be sorted by name in ascendant order' do
+    community = fast_create(Community)
+    another_user = create_user('another_user').person
+    different_user = create_user('different_user').person
+
+    community.add_member(@profile)
+    community.add_member(another_user)
+    community.add_member(different_user)
+
+    get :members, :profile => community.identifier, :sort => "asc"
+
+    assert @response.body.index("another_user") < @response.body.index("different_user")
+  end
+
+  should 'members be sorted by name in descendant order' do
+    community = fast_create(Community)
+    another_user = create_user('another_user').person
+    different_user = create_user('different_user').person
+
+    community.add_member(@profile)
+    community.add_member(another_user)
+    community.add_member(different_user)
+
+    get :members, :profile => community.identifier, :sort => "desc"
+
+    assert @response.body.index("another_user") > @response.body.index("different_user")
+  end
+
 end
	@@ -8,6 +8,7 @@ class ContentViewerController < ApplicationController		@@ -8,6 +8,7 @@ class ContentViewerController < ApplicationController
8	helper TagsHelper	8	helper TagsHelper
9		9
10	def view_page	10	def view_page
		11	+
11	path = get_path(params[:page], params[:format])	12	path = get_path(params[:page], params[:format])
12		13
13	@version = params[:version].to_i	14	@version = params[:version].to_i
	@@ -38,7 +39,7 @@ class ContentViewerController < ApplicationController		@@ -38,7 +39,7 @@ class ContentViewerController < ApplicationController
38	end	39	end
39		40
40	# At this point the page will be showed	41	# At this point the page will be showed
41	- @page.hit unless user_is_a_bot?	42	+ @page.hit unless user_is_a_bot? \|\| already_visited?(@page)
42		43
43	@page = FilePresenter.for @page	44	@page = FilePresenter.for @page
44		45
	@@ -272,4 +273,18 @@ class ContentViewerController < ApplicationController		@@ -272,4 +273,18 @@ class ContentViewerController < ApplicationController
272	@comment_order = params[:comment_order].nil? ? 'oldest' : params[:comment_order]	273	@comment_order = params[:comment_order].nil? ? 'oldest' : params[:comment_order]
273	end	274	end
274		275
		276	+ private
		277	+
		278	+ def already_visited?(element)
		279	+ user_id = if user.nil? then -1 else current_user.id end
		280	+ user_id = "#{user_id}_#{element.id}_#{element.class}"
		281	+
		282	+ if cookies.signed[:visited] == user_id
		283	+ return true
		284	+ else
		285	+ cookies.permanent.signed[:visited] = user_id
		286	+ return false
		287	+ end
		288	+ end
		289	+
275	end	290	end
	@@ -957,7 +957,8 @@ private :generate_url, :url_options		@@ -957,7 +957,8 @@ private :generate_url, :url_options
957		957
958	def members_cache_key(params = {})	958	def members_cache_key(params = {})
959	page = params[:npage] \|\| '1'	959	page = params[:npage] \|\| '1'
960	- cache_key + '-members-page-' + page	960	+ sort = (params[:sort] == 'desc') ? params[:sort] : 'asc'
		961	+ cache_key + '-members-page-' + page + '-' + sort
961	end	962	end
962		963
963	def more_recent_label	964	def more_recent_label
@@ -0,0 +1,16 @@		@@ -0,0 +1,16 @@
	1	+<div id="profile-members-sort-options">
	2	+ <%= label_tag("sort-#{role}", _("Sort by:")) %>
	3	+ <%= select_tag("sort-#{role}",
	4	+ options_for_select([
	5	+ [_("Name A-Z"), 'asc'],
	6	+ [_("Name Z-A"), 'desc'],
	7	+ ], :selected => params[:sort])
	8	+ ) %>
	9	+</div>
	10	+<ul class="profile-list-<%= role %>" >
	11	+ <% users.each do \|u\| %>
	12	+ <%= profile_image_link(u) %>
	13	+ <% end %>
	14	+</ul>
	15	+
	16	+<%= pagination_links users, :param_name => 'npage' %>
1	<div class="common-profile-list-block">	1	<div class="common-profile-list-block">
2		2
3	-<h1><%= _("%s's members") % profile.name %></h1>	3	+<h1><%= _("Members (%d)") % @profile_members.total_entries %></h1>
		4	+<h2 class="community-name"><%= profile.name %></h2>
4		5
5	<% cache_timeout(profile.members_cache_key(params), 4.hours) do %>	6	<% cache_timeout(profile.members_cache_key(params), 4.hours) do %>
6	- <ul class='profile-list'>
7	- <% @members.each do \|member\| %>
8	- <%= profile_image_link(member) %>
9	- <% end %>
10	- </ul>	7	+ <div class="profile-members-tabs-container">
		8	+ <% tabs = [] %>
		9	+
		10	+ <% div_members = content_tag :div, :class => "profile-members" do
		11	+ render :partial => 'profile_members_list',
		12	+ :locals => {
		13	+ :users => @profile_members,
		14	+ :role => "members"
		15	+ }
		16	+ end %>
		17	+
		18	+ <% tabs << {:title => _("%d Members") % @profile_members.total_entries,
		19	+ :id => "members-tab",
		20	+ :content => div_members
		21	+ } %>
11		22
12	- <div id='pagination-profiles'>
13	- <%= pagination_links @members, :param_name => 'npage' %>
14	- </div>	23	+ <% div_admins = content_tag :div, :class => "profile-admins" do
		24	+ render :partial => 'profile_members_list',
		25	+ :locals => {
		26	+ :users => @profile_admins,
		27	+ :role => "admins"
		28	+ }
		29	+ end %>
		30	+
		31	+ <% tabs << {:title => _("%d Administrators") % @profile_admins.total_entries,
		32	+ :id => "admins-tab",
		33	+ :content => div_admins
		34	+ } %>
		35	+
		36	+ <%= render_tabs(tabs) %>
		37	+ </div><!-- end of class="profile-members-tabs-container" -->
15	<% end %>	38	<% end %>
16		39
17	<% button_bar do %>	40	<% button_bar do %>
	@@ -26,4 +49,7 @@		@@ -26,4 +49,7 @@
26	<% end %>	49	<% end %>
27	<% end %>	50	<% end %>
28		51
29	-</div><!-- fim class="common-profile-list-block" -->	52	+<%= hidden_field_tag "profile_url", @profile_members_url %>
		53	+</div><!-- end of class="common-profile-list-block" -->
		54	+
		55	+<%= javascript_include_tag "members_page.js" %>
	@@ -1,20 +0,0 @@	@@ -1,20 +0,0 @@
1	-class PeopleBlockPluginProfileController < ProfileController
2	-
3	- append_view_path File.join(File.dirname(__FILE__) + '/../views')
4	-
5	- def members
6	- if is_cache_expired?(profile.members_cache_key(params))
7	- unless params[:role_key].blank?
8	- role = Role.find_by_key_and_environment_id(params[:role_key], profile.environment)
9	- @members = profile.members.with_role(role.id)
10	- @members_title = role.name
11	- else
12	- @members = profile.members
13	- @members_title = 'members'
14	- end
15	- @members = @members.includes(relations_to_include).paginate(:per_page => members_per_page, :page => params[:npage], :total_entries => @members.count)
16	- end
17	- render "profile/members"
18	- end
19	-
20	-end
	@@ -1,76 +0,0 @@	@@ -1,76 +0,0 @@
1	-require_relative '../test_helper'
2	-require_relative '../../controllers/people_block_plugin_profile_controller'
3	-
4	-
5	-# Re-raise errors caught by the controller.
6	-class PeopleBlockPluginProfileController; def rescue_action(e) raise e end; end
7	-
8	-class PeopleBlockPluginProfileControllerTest < ActionController::TestCase
9	-
10	- def setup
11	- @controller = PeopleBlockPluginProfileController.new
12	- @request = ActionController::TestRequest.new
13	- @response = ActionController::TestResponse.new
14	-
15	- @profile = fast_create(Community)
16	-
17	- @environment = @profile.environment
18	- @environment.enabled_plugins = ['PeopleBlockPlugin']
19	- @environment.save!
20	-
21	- MembersBlock.delete_all
22	- @block = MembersBlock.new
23	- @block.box = @profile.boxes.first
24	- @block.save!
25	-
26	- @admin = create_user('adminprofile').person
27	- @member = create_user('memberprofile').person
28	- @moderator = create_user('moderatorprofile').person
29	- @profile.add_moderator(@moderator)
30	- @profile.add_member(@member)
31	- @profile.add_admin(@admin)
32	- end
33	-
34	- attr_accessor :profile, :block, :admin, :member, :moderator
35	-
36	- should 'list members without role_key' do
37	- get :members, :profile => profile.identifier, :role_key => ""
38	- assert_response :success
39	- assert_template 'members'
40	- assert_equivalent [@admin, @member, @moderator], assigns(:members)
41	- assert_match /adminprofile/, @response.body
42	- assert_match /memberprofile/, @response.body
43	- assert_match /moderatorprofile/, @response.body
44	- end
45	-
46	- should 'list members with role_key=nil' do
47	- get :members, :profile => profile.identifier, :role_key => nil
48	- assert_response :success
49	- assert_template 'members'
50	- assert_equivalent [@admin, @member, @moderator], assigns(:members)
51	- assert_match /adminprofile/, @response.body
52	- assert_match /memberprofile/, @response.body
53	- assert_match /moderatorprofile/, @response.body
54	- end
55	-
56	- should 'list members only' do
57	- get :members, :profile => profile.identifier, :role_key => Profile::Roles.member(profile.environment.id).key
58	- assert_response :success
59	- assert_template 'members'
60	- assert_equal [@member], assigns(:members)
61	- assert_no_match /adminprofile/, @response.body
62	- assert_match /memberprofile/, @response.body
63	- assert_no_match /moderatorprofile/, @response.body
64	- end
65	-
66	- should 'list moderators only' do
67	- get :members, :profile => profile.identifier, :role_key => Profile::Roles.moderator(profile.environment.id).key
68	- assert_response :success
69	- assert_template 'members'
70	- assert_equal [@moderator], assigns(:members)
71	- assert_no_match /adminprofile/, @response.body
72	- assert_no_match /memberprofile/, @response.body
73	- assert_match /moderatorprofile/, @response.body
74	- end
75	-
76	-end
	@@ -147,11 +147,11 @@ class MembersBlockTest < ActionView::TestCase		@@ -147,11 +147,11 @@ class MembersBlockTest < ActionView::TestCase
147		147
148	instance_eval(&block.footer)	148	instance_eval(&block.footer)
149	assert_select 'a.view-all' do \|elements\|	149	assert_select 'a.view-all' do \|elements\|
150	- assert_select '[href=/profile/mytestuser/plugin/people_block/members]'	150	+ assert_select "[href=/profile/mytestuser/members#members-tab]"
151	end	151	end
152	end	152	end
153		153
154	- should 'provide link to members page with a selected role' do	154	+ should 'provide link to members page when visible_role is profile_member' do
155	profile = create_user('mytestuser').person	155	profile = create_user('mytestuser').person
156	block = MembersBlock.new	156	block = MembersBlock.new
157	block.box = profile.boxes.first	157	block.box = profile.boxes.first
	@@ -160,7 +160,33 @@ class MembersBlockTest < ActionView::TestCase		@@ -160,7 +160,33 @@ class MembersBlockTest < ActionView::TestCase
160		160
161	instance_eval(&block.footer)	161	instance_eval(&block.footer)
162	assert_select 'a.view-all' do \|elements\|	162	assert_select 'a.view-all' do \|elements\|
163	- assert_select '[href=/profile/mytestuser/plugin/people_block/members?role_key=profile_member]'	163	+ assert_select '[href=/profile/mytestuser/members#members-tab]'
		164	+ end
		165	+ end
		166	+
		167	+ should 'provide link to members page when visible_role is profile_moderator' do
		168	+ profile = create_user('mytestuser').person
		169	+ block = MembersBlock.new
		170	+ block.box = profile.boxes.first
		171	+ block.visible_role = 'profile_moderator'
		172	+ block.save!
		173	+
		174	+ instance_eval(&block.footer)
		175	+ assert_select 'a.view-all' do \|elements\|
		176	+ assert_select '[href=/profile/mytestuser/members#members-tab]'
		177	+ end
		178	+ end
		179	+
		180	+ should 'provide link to admins page when visible_role is profile_admin' do
		181	+ profile = create_user('mytestuser').person
		182	+ block = MembersBlock.new
		183	+ block.box = profile.boxes.first
		184	+ block.visible_role = 'profile_admin'
		185	+ block.save!
		186	+
		187	+ instance_eval(&block.footer)
		188	+ assert_select 'a.view-all' do \|elements\|
		189	+ assert_select '[href=/profile/mytestuser/members#admins-tab]'
164	end	190	end
165	end	191	end
166		192
1	-<%= link_to c_('View all'), {:profile => profile.identifier, :controller => 'people_block_plugin_profile', :action => 'members', :role_key => role_key}, :class => 'view-all' %>	1	+<% anchor = role_key == "profile_admin" ? "admins-tab" : "members-tab" %>
		2	+<%= link_to c_('View all'), {:profile => profile.identifier, :controller => 'profile', :action => 'members', :anchor =>anchor }, :class => 'view-all' %>
2		3
3	<% if show_join_leave_button %>	4	<% if show_join_leave_button %>
4	<%= render :partial => 'blocks/profile_info_actions/join_leave_community' %>	5	<%= render :partial => 'blocks/profile_info_actions/join_leave_community' %>
	@@ -231,6 +231,10 @@ body, th, td, input {		@@ -231,6 +231,10 @@ body, th, td, input {
231	border-left: 0px;	231	border-left: 0px;
232	}	232	}
233		233
		234	+.menu-submenu-list>li{
		235	+ width: 100%;
		236	+}
		237	+
234	#navigation .menu-submenu ul{	238	#navigation .menu-submenu ul{
235	border: 1px solid #888a85;	239	border: 1px solid #888a85;
236	border-top: 0px;	240	border-top: 0px;
	@@ -1534,3 +1538,7 @@ table#recaptcha_table tr:hover td {		@@ -1534,3 +1538,7 @@ table#recaptcha_table tr:hover td {
1534	width: 494px;	1538	width: 494px;
1535	padding-left: 2px;	1539	padding-left: 2px;
1536	}	1540	}
		1541	+
		1542	+.profile-members-title-sort {
		1543	+ clear: both;
		1544	+}
@@ -0,0 +1,24 @@		@@ -0,0 +1,24 @@
	1	+(function($) {
	2	+ "use strict";
	3	+
	4	+ function set_members_sort() {
	5	+ var profile_members_url = $("#profile_url").val();
	6	+
	7	+ $("#sort-members, #sort-admins").on("change", function() {
	8	+ var sort_value = this.value;
	9	+ var role = this.id;
	10	+ role = role.replace("sort-", '');
	11	+ var actual_page_content = $(".profile-list-"+role);
	12	+
	13	+ $.get(profile_members_url, {sort: sort_value}, function(response) {
	14	+ var html_response = $(response);
	15	+
	16	+ actual_page_content.html(html_response.find(".profile-list-"+role).html());
	17	+ });
	18	+ });
	19	+ }
	20	+
	21	+ $(document).ready(function() {
	22	+ set_members_sort();
	23	+ });
	24	+}) (jQuery);