Merge branch 'serpro-context' into stable

Conflicts: app/models/profile.rb app/views/profile_editor/edit.html.erb

Merge branch 'serpro-context' into stable
Conflicts: app/models/profile.rb app/views/profile_editor/edit.html.erb
Victor Costa
2 parents b77d88ab ce9e80c8
Showing 17 changed files with 160 additions and 61 deletions Show diff stats
.gitmodules
app/models/profile.rb
app/views/favorite_enterprises/index.html.erb
app/views/layouts/application-ng.html.erb
app/views/profile_editor/edit.html.erb
db/migrate/20150223180806_add_secret_to_profile.rb
db/schema.rb
features/secret_community.feature
plugins/breadcrumbs/lib/breadcrumbs_plugin/content_breadcrumbs_block.rb
plugins/breadcrumbs/test/functional/profile_design_controller_test.rb
plugins/breadcrumbs/views/box_organizer/breadcrumbs_plugin/_content_breadcrumbs_block.html.erb
plugins/metadata/lib/ext/environment.rb
plugins/pg_search/db/migrate/20130320010063_create_indexes_for_search.rb
plugins/site_tour
public/javascripts/application.js
public/javascripts/profile_editor.js
test/unit/profile_test.rb
@@ -16,3 +16,6 @@
 [submodule "plugins/proposals_discussion"]
 	path = plugins/proposals_discussion
 	url = git@gitlab.com:noosfero-plugins/proposals_discussion.git
+[submodule "plugins/site_tour"]
+	path = plugins/site_tour
+	url = git@gitlab.com:noosfero-plugins/site_tour.git
@@ -3,7 +3,7 @@
 # which by default is the one returned by Environment:default.
 class Profile < ActiveRecord::Base
  
-  attr_accessible :name, :identifier, :public_profile, :nickname, :custom_footer, :custom_header, :address, :zip_code, :contact_phone, :image_builder, :description, :closed, :template_id, :environment, :lat, :lng, :is_template, :fields_privacy, :preferred_domain_id, :category_ids, :country, :city, :state, :national_region_code, :email, :contact_email, :redirect_l10n, :notification_time, :redirection_after_login, :email_suggestions, :allow_members_to_invite, :invite_friends_only, :custom_fields
+  attr_accessible :name, :identifier, :public_profile, :nickname, :custom_footer, :custom_header, :address, :zip_code, :contact_phone, :image_builder, :description, :closed, :template_id, :environment, :lat, :lng, :is_template, :fields_privacy, :preferred_domain_id, :category_ids, :country, :city, :state, :national_region_code, :email, :contact_email, :redirect_l10n, :notification_time, :redirection_after_login, :email_suggestions, :allow_members_to_invite, :invite_friends_only, :secret, :custom_fields
  
   # use for internationalizable human type names in search facets
   # reimplement on subclasses
@@ -116,16 +116,6 @@ class Profile &lt; ActiveRecord::Base
   scope :templates, {:conditions => {:is_template => true}}
   scope :no_templates, {:conditions => {:is_template => false}}
  
-  #FIXME make this test
-  scope :newer_than, lambda { |reference_id|
-    {:conditions => ["profiles.id > #{reference_id}"]}
-  }
-
-  #FIXME make this test
-  scope :older_than, lambda { |reference_id|
-    {:conditions => ["profiles.id < #{reference_id}"]}
-  }
-
   def members
     scopes = plugins.dispatch_scopes(:organization_members, self)
     scopes << Person.members_of(self)
@@ -703,32 +693,6 @@ private :generate_url, :url_options
     end
   end
  
-  # Adds many people to profile by id's or email's
-  def add_members(people_ids)
-
-    unless people_ids.nil? && people_ids.empty?
-      people = []
-
-      if people_ids.first =~ /\@/
-        people = User.where(email: people_ids)
-      else
-        people = Person.where(id: people_ids)
-      end
-
-      people.each do |profile|
-        person = profile
-
-        if profile.is_a? User
-          person = profile.person
-        end
-
-        unless person.is_member_of?(self)
-          add_member person
-        end
-      end
-    end
-  end
-
   def remove_member(person)
     self.disaffiliate(person, Profile::Roles.all_roles(environment.id))
   end
@@ -975,13 +939,6 @@ private :generate_url, :url_options
     image.public_filename(:icon) if image.present?
   end
  
-  #FIXME make this test
-  def profile_custom_image(size = :icon)
-    image_path = profile_custom_icon if size == :icon
-    image_path ||= image.public_filename(size) if image.present?
-    image_path
-  end
-
   def jid(options = {})
     domain = options[:domain] || environment.default_hostname
     "#{identifier}@#{domain}"
@@ -9,7 +9,7 @@
                         enterprise.identifier, :class => 'profile-link' %>
     <%# profile_image_link enterprise, :portrait, 'div' %>
     <div class="controll">
-      <%= button(:delete, _('remove'), { :action => 'remove', :id => enterprise.id },:title => _('remove')) %>
+      <%= button_without_text(:delete, _('remove'), { :action => 'remove', :id => enterprise.id },:title => _('remove')) %>
     </div><!-- end class="controll" -->
   </li>
 <% end %>
@@ -6,6 +6,10 @@
     <!--<meta http-equiv="refresh" content="1"/>-->
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
  
+    <% unless defined? MetadataPlugin and environment.enabled_plugins.include? 'MetadataPlugin' %>
+      <meta name="description" content="<%= @environment.name %>" />
+    <% end %>
+
     <!-- site root -->
     <meta property="noosfero:root" content="<%= Noosfero.root %>"/>
  
@@ -33,14 +33,14 @@
       <%= labelled_radio_button _('Private &mdash; show my contents only to friends'), 'profile_data[public_profile]', false, !@profile.public_profile? %>
     </div>
   <% else %>
-    <div style="border-bottom: 1px solid #e0e0e0; padding-bottom: 7px; margin-bottom: 7px;">
-       <%= labelled_check_box _('Hidden &mdash; this group will be visible only by members'), 'profile_data[visible]', false, !@profile.visible %>
+    <div>
+      <%= labelled_check_box _("Secret &mdash; hide the community and all its contents for non members and other people can't join this community unless they are invited to."), 'profile_data[secret]', true, profile.secret, :class => "profile-secret-box" %>
     </div>
     <div>
-      <%= labelled_radio_button _('Public &mdash; show content of this group to all internet users'), 'profile_data[public_profile]', true, @profile.public_profile? %>
+      <%= labelled_radio_button _('Public &mdash; show content of this group to all internet users'), 'profile_data[public_profile]', true, @profile.public_profile?, :class => "public-community-button" %>
     </div>
     <div>
-      <%= labelled_radio_button _('Private &mdash; show content of this group only to members'), 'profile_data[public_profile]', false, !@profile.public_profile? %>
+      <%= labelled_radio_button _('Private &mdash; show content of this group only to members'), 'profile_data[public_profile]', false, !@profile.public_profile?, :class => "private-community-button" %>
     </div>
   <% end %>
  
@@ -89,3 +89,5 @@
     <% end %>
   <% end %>
 <% end %>
+
+<%= javascript_include_tag 'profile_editor' %>
@@ -0,0 +1,5 @@
+class AddSecretToProfile < ActiveRecord::Migration
+  def change
+    add_column :profiles, :secret, :boolean, :default => false
+  end
+end
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
  
-ActiveRecord::Schema.define(:version => 20150122165042) do
+ActiveRecord::Schema.define(:version => 20150223180806) do
  
   create_table "abuse_reports", :force => true do |t|
     t.integer  "reporter_id"
@@ -535,6 +535,7 @@ ActiveRecord::Schema.define(:version =&gt; 20150122165042) do
     t.integer  "welcome_page_id"
     t.boolean  "allow_members_to_invite",               :default => true
     t.boolean  "invite_friends_only",                   :default => false
+    t.boolean  "secret",                                :default => false
   end
  
   add_index "profiles", ["activities_count"], :name => "index_profiles_on_activities_count"
@@ -0,0 +1,60 @@
+Feature: Use a secret community
+  As a community administrator
+  I want to manage the community privacy
+
+  Background:
+    Given the following users
+      | login | name           |
+      | jose  | Jose Wilker    |
+      | maria | Maria Carminha |
+    And the following community
+      | identifier  | name         |
+      | mycommunity | My Community |
+    And "Jose Wilker" is admin of "My Community"
+    And I am logged in as "jose"
+    And I go to mycommunity's control panel
+    And I follow "Community Info and settings"
+    And I check "Secret"
+    And I press "Save"
+    And I follow "Logout"
+
+  @selenium
+  Scenario: Hide privacity options when secret is checked
+    Given I am logged in as "jose"
+    And I go to mycommunity's control panel
+    And I follow "Community Info and settings"
+    Then I should not see "Public — show content of this group to all internet users"
+    And I should not see "Private — show content of this group only to members"
+    And I uncheck "Secret"
+    Then I should see "Public — show content of this group to all internet users"
+    Then I should see "Private — show content of this group only to members"
+
+  @selenium
+  Scenario: Non members shouldn't see secret communit's content
+    Given I am logged in as "maria"
+    And I go to mycommunity's homepage
+    And I should see "Access denied"
+    And I follow "Communities"
+    Then I should not see "My Community"
+
+  Scenario: A member should see the secret community's content
+    Given I am logged in as "maria"
+    And "Maria Carminha" is a member of "My Community"
+    And I go to maria's control panel
+    And I follow "Manage my groups"
+    And I follow "My Community"
+    Then I should see "My Community"
+
+  @selenium
+  Scenario: public article on a secret profile should not be displayed
+    Given I am logged in as "jose"
+    And I go to mycommunity's control panel
+    And I follow "Manage Content"
+    And I follow "New content"
+    And I follow "Text article with visual editor"
+    And I fill in "Title" with "My public article"
+    And I choose "Public"
+    And I press "Save and continue"
+    When I am logged in as "maria"
+    And I go to /mycommunity/my-public-article
+    Then I should not see "My public article"
@@ -2,8 +2,9 @@ class BreadcrumbsPlugin::ContentBreadcrumbsBlock &lt; Block
  
   settings_items :show_cms_action, :type => :boolean, :default => true
   settings_items :show_profile, :type => :boolean, :default => true
+  settings_items :show_section_name, :type => :boolean, :default => true
  
-  attr_accessible :show_cms_action, :show_profile
+  attr_accessible :show_cms_action, :show_profile, :show_section_name
  
   def self.description
     _("<p>Display a breadcrumb of the current content navigation.</p><p>You could choose if the breadcrumb is going to appear in the cms editing or not.</p> <p>There is either the option of display the profile location in the breadcrumb path.</p>")
@@ -48,7 +49,18 @@ class BreadcrumbsPlugin::ContentBreadcrumbsBlock &lt; Block
     proc do
       trail = block.trail(@page, @profile, params)
       if !trail.empty?
-        trail.map { |t| link_to(t[:name], t[:url], :class => 'item') }.join(content_tag('span', ' > ', :class => 'separator'))
+        separator = content_tag('span', ' > ', :class => 'separator')
+
+        breadcrumb = trail.map do |t|
+          link_to(t[:name], t[:url], :class => 'item')
+        end.join(separator)
+
+        if block.show_section_name
+          section_name = block.show_profile ? trail.second[:name] : trail.first[:name]
+          breadcrumb << content_tag('div', section_name, :class => 'section-name')
+        end
+
+        breadcrumb
       else
         ''
       end
@@ -41,4 +41,9 @@ class ProfileDesignControllerTest &lt; ActionController::TestCase
     assert !@block.show_cms_action
   end
  
+  should 'be able save breadcrumbs block with show_section_name option' do
+    get :edit, :id => @block.id, :profile => @profile.identifier
+    post :save, :id => @block.id, :profile => @profile.identifier, :block => {:title => 'breadcrumbs', :show_cms_action => false, :show_profile => true, :show_section_name => true }
+    assert @block.show_section_name
+  end
 end
 <div id='edit-breadcrumbs-block'>
   <%= labelled_form_field check_box(:block, :show_cms_action) + _('Show cms action'), '' %>
   <%= labelled_form_field check_box(:block, :show_profile) + _('Show profile'), '' %>
+  <%= labelled_form_field check_box(:block, :show_section_name) + _('Show section name'), '' %>
 </div>
@@ -2,6 +2,10 @@ require_dependency &#39;environment&#39;
  
 class Environment
  
+  metadata_spec tags: {
+    description: proc{ |e, plugin| e.name },
+  }
+
   metadata_spec namespace: :og, tags: {
     type: 'website',
     title: proc{ |e, plugin| e.name },
 class CreateIndexesForSearch < ActiveRecord::Migration
+  SEARCHABLES = %w[ article comment qualifier national_region certifier profile license scrap category ]
+  KLASSES = SEARCHABLES.map {|searchable| searchable.camelize.constantize }
   def self.up
-    searchables = %w[ article comment qualifier national_region certifier profile license scrap category ]
-    klasses = searchables.map {|searchable| searchable.camelize.constantize }
-    klasses.each do |klass|
+    KLASSES.each do |klass|
       fields = klass.pg_search_plugin_fields
       execute "create index pg_search_plugin_#{klass.name.singularize.downcase} on #{klass.table_name} using gin(to_tsvector('simple', #{fields}))"
     end
   end
  
   def self.down
-    klasses.each do |klass|
+    KLASSES.each do |klass|
       execute "drop index pg_search_plugin_#{klass.name.singularize.downcase}"
     end
   end
@@ -0,0 +1 @@
+Subproject commit e6925e5450f49bc7d89414c0f20876351933cebd
@@ -1074,7 +1074,7 @@ jQuery(document).ready(function(){
 function apply_zoom_to_images(zoom_text) {
   jQuery(function($) {
     $(window).load( function() {
-      $('#article .article-body img').each( function(index) {
+      $('#article .article-body img:not(.disable-zoom)').each( function(index) {
         var original = original_image_dimensions($(this).attr('src'));
         if ($(this).width() < original['width'] || $(this).height() < original['height']) {
           $(this).wrap('<div class="zoomable-image" />');
@@ -0,0 +1,26 @@
+(function($){
+  'use strict';
+
+  function show_or_hide_privacy_radio_buttons(hide_options) {
+    var public_community = $(".public-community-button").parent();
+    var private_community = $(".private-community-button").parent();
+    if (hide_options) {
+      $(".private-community-button").selected();
+      public_community.hide();
+      private_community.hide();
+
+    } else {
+      public_community.show();
+      private_community.show();
+    }
+  }
+
+  $(document).ready(function(){
+    var profile_secret = $(".profile-secret-box");
+    show_or_hide_privacy_radio_buttons(profile_secret.is(":checked"));
+    profile_secret.change(function(){
+      show_or_hide_privacy_radio_buttons(this.checked);
+    });
+
+  });
+})(jQuery);
@@ -443,6 +443,24 @@ class ProfileTest &lt; ActiveSupport::TestCase
     assert_not_includes result, p2
   end
  
+  should 'be able to find the public profiles but not secret ones' do
+    p1 = create(Profile, :public_profile => true)
+    p2 = create(Profile, :public_profile => true, :secret => true)
+
+    result = Profile.public
+    assert_includes result, p1
+    assert_not_includes result, p2
+  end
+
+  should 'be able to find visible profiles but not secret ones' do
+    p1 = create(Profile, :visible => true)
+    p2 = create(Profile, :visible => true, :secret => true)
+
+    result = Profile.visible
+    assert_includes result, p1
+    assert_not_includes result, p2
+  end
+
   should 'have public content by default' do
     assert_equal true, Profile.new.public_content
   end
@@ -485,7 +503,7 @@ class ProfileTest &lt; ActiveSupport::TestCase
   should 'categorize in the entire category hierarchy' do
     c1 = fast_create(Category)
     c2 = fast_create(Category, :parent_id => c1.id)
-    c3 = fast_create(Category, :parent_id => c2.id) 
+    c3 = fast_create(Category, :parent_id => c2.id)
  
     profile = create_user('testuser').person
     profile.add_category(c3)
@@ -1006,7 +1024,7 @@ class ProfileTest &lt; ActiveSupport::TestCase
  
   should 'copy header when applying template' do
     template = fast_create(Profile)
-    template[:custom_header] = '{name}' 
+    template[:custom_header] = '{name}'
     template.save!
  
     p = create(Profile, :name => 'test prof')
@@ -1260,7 +1278,7 @@ class ProfileTest &lt; ActiveSupport::TestCase
     task2 = Task.create!(:requestor => person, :target => another)
  
     person.stubs(:is_admin?).with(other).returns(true)
-    Environment.find(:all).select{|i| i != other }.each do |env| 
+    Environment.find(:all).select{|i| i != other }.each do |env|
       person.stubs(:is_admin?).with(env).returns(false)
     end
  
@@ -1729,7 +1747,7 @@ class ProfileTest &lt; ActiveSupport::TestCase
     assert profile.is_on_homepage?("/#{profile.identifier}/#{homepage.slug}", homepage)
   end
  
-  
+
   should 'find profiles with image' do
     env = fast_create(Environment)
     2.times do |n|
...	...	@@ -16,3 +16,6 @@
16	16	[submodule "plugins/proposals_discussion"]
17	17	path = plugins/proposals_discussion
18	18	url = git@gitlab.com:noosfero-plugins/proposals_discussion.git
	19	+[submodule "plugins/site_tour"]
	20	+ path = plugins/site_tour
	21	+ url = git@gitlab.com:noosfero-plugins/site_tour.git
...	...
...	...	@@ -3,7 +3,7 @@
3	3	# which by default is the one returned by Environment:default.
4	4	class Profile < ActiveRecord::Base
5	5
6		- attr_accessible :name, :identifier, :public_profile, :nickname, :custom_footer, :custom_header, :address, :zip_code, :contact_phone, :image_builder, :description, :closed, :template_id, :environment, :lat, :lng, :is_template, :fields_privacy, :preferred_domain_id, :category_ids, :country, :city, :state, :national_region_code, :email, :contact_email, :redirect_l10n, :notification_time, :redirection_after_login, :email_suggestions, :allow_members_to_invite, :invite_friends_only, :custom_fields
	6	+ attr_accessible :name, :identifier, :public_profile, :nickname, :custom_footer, :custom_header, :address, :zip_code, :contact_phone, :image_builder, :description, :closed, :template_id, :environment, :lat, :lng, :is_template, :fields_privacy, :preferred_domain_id, :category_ids, :country, :city, :state, :national_region_code, :email, :contact_email, :redirect_l10n, :notification_time, :redirection_after_login, :email_suggestions, :allow_members_to_invite, :invite_friends_only, :secret, :custom_fields
7	7
8	8	# use for internationalizable human type names in search facets
9	9	# reimplement on subclasses
...	...	@@ -116,16 +116,6 @@ class Profile < ActiveRecord::Base
116	116	scope :templates, {:conditions => {:is_template => true}}
117	117	scope :no_templates, {:conditions => {:is_template => false}}
118	118
119		- #FIXME make this test
120		- scope :newer_than, lambda { \|reference_id\|
121		- {:conditions => ["profiles.id > #{reference_id}"]}
122		- }
123		-
124		- #FIXME make this test
125		- scope :older_than, lambda { \|reference_id\|
126		- {:conditions => ["profiles.id < #{reference_id}"]}
127		- }
128		-
129	119	def members
130	120	scopes = plugins.dispatch_scopes(:organization_members, self)
131	121	scopes << Person.members_of(self)
...	...	@@ -703,32 +693,6 @@ private :generate_url, :url_options
703	693	end
704	694	end
705	695
706		- # Adds many people to profile by id's or email's
707		- def add_members(people_ids)
708		-
709		- unless people_ids.nil? && people_ids.empty?
710		- people = []
711		-
712		- if people_ids.first =~ /\@/
713		- people = User.where(email: people_ids)
714		- else
715		- people = Person.where(id: people_ids)
716		- end
717		-
718		- people.each do \|profile\|
719		- person = profile
720		-
721		- if profile.is_a? User
722		- person = profile.person
723		- end
724		-
725		- unless person.is_member_of?(self)
726		- add_member person
727		- end
728		- end
729		- end
730		- end
731		-
732	696	def remove_member(person)
733	697	self.disaffiliate(person, Profile::Roles.all_roles(environment.id))
734	698	end
...	...	@@ -975,13 +939,6 @@ private :generate_url, :url_options
975	939	image.public_filename(:icon) if image.present?
976	940	end
977	941
978		- #FIXME make this test
979		- def profile_custom_image(size = :icon)
980		- image_path = profile_custom_icon if size == :icon
981		- image_path \|\|= image.public_filename(size) if image.present?
982		- image_path
983		- end
984		-
985	942	def jid(options = {})
986	943	domain = options[:domain] \|\| environment.default_hostname
987	944	"#{identifier}@#{domain}"
...	...
...	...	@@ -9,7 +9,7 @@
9	9	enterprise.identifier, :class => 'profile-link' %>
10	10	<%# profile_image_link enterprise, :portrait, 'div' %>
11	11	<div class="controll">
12		- <%= button(:delete, _('remove'), { :action => 'remove', :id => enterprise.id },:title => _('remove')) %>
	12	+ <%= button_without_text(:delete, _('remove'), { :action => 'remove', :id => enterprise.id },:title => _('remove')) %>
13	13	</div><!-- end class="controll" -->
14	14	</li>
15	15	<% end %>
...	...
...	...	@@ -6,6 +6,10 @@
6	6	<!--<meta http-equiv="refresh" content="1"/>-->
7	7	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
8	8
	9	+ <% unless defined? MetadataPlugin and environment.enabled_plugins.include? 'MetadataPlugin' %>
	10	+ <meta name="description" content="<%= @environment.name %>" />
	11	+ <% end %>
	12	+
9	13	<!-- site root -->
10	14	<meta property="noosfero:root" content="<%= Noosfero.root %>"/>
11	15
...	...
...	...	@@ -33,14 +33,14 @@
33	33	<%= labelled_radio_button _('Private — show my contents only to friends'), 'profile_data[public_profile]', false, !@profile.public_profile? %>
34	34	</div>
35	35	<% else %>
36		- <div style="border-bottom: 1px solid #e0e0e0; padding-bottom: 7px; margin-bottom: 7px;">
37		- <%= labelled_check_box _('Hidden — this group will be visible only by members'), 'profile_data[visible]', false, !@profile.visible %>
	36	+ <div>
	37	+ <%= labelled_check_box _("Secret — hide the community and all its contents for non members and other people can't join this community unless they are invited to."), 'profile_data[secret]', true, profile.secret, :class => "profile-secret-box" %>
38	38	</div>
39	39	<div>
40		- <%= labelled_radio_button _('Public — show content of this group to all internet users'), 'profile_data[public_profile]', true, @profile.public_profile? %>
	40	+ <%= labelled_radio_button _('Public — show content of this group to all internet users'), 'profile_data[public_profile]', true, @profile.public_profile?, :class => "public-community-button" %>
41	41	</div>
42	42	<div>
43		- <%= labelled_radio_button _('Private — show content of this group only to members'), 'profile_data[public_profile]', false, !@profile.public_profile? %>
	43	+ <%= labelled_radio_button _('Private — show content of this group only to members'), 'profile_data[public_profile]', false, !@profile.public_profile?, :class => "private-community-button" %>
44	44	</div>
45	45	<% end %>
46	46
...	...	@@ -89,3 +89,5 @@
89	89	<% end %>
90	90	<% end %>
91	91	<% end %>
	92	+
	93	+<%= javascript_include_tag 'profile_editor' %>
...	...
...	...	@@ -0,0 +1,5 @@
	1	+class AddSecretToProfile < ActiveRecord::Migration
	2	+ def change
	3	+ add_column :profiles, :secret, :boolean, :default => false
	4	+ end
	5	+end
...	...
...	...	@@ -11,7 +11,7 @@
11	11	#
12	12	# It's strongly recommended to check this file into your version control system.
13	13
14		-ActiveRecord::Schema.define(:version => 20150122165042) do
	14	+ActiveRecord::Schema.define(:version => 20150223180806) do
15	15
16	16	create_table "abuse_reports", :force => true do \|t\|
17	17	t.integer "reporter_id"
...	...	@@ -535,6 +535,7 @@ ActiveRecord::Schema.define(:version => 20150122165042) do
535	535	t.integer "welcome_page_id"
536	536	t.boolean "allow_members_to_invite", :default => true
537	537	t.boolean "invite_friends_only", :default => false
	538	+ t.boolean "secret", :default => false
538	539	end
539	540
540	541	add_index "profiles", ["activities_count"], :name => "index_profiles_on_activities_count"
...	...
...	...	@@ -0,0 +1,60 @@
	1	+Feature: Use a secret community
	2	+ As a community administrator
	3	+ I want to manage the community privacy
	4	+
	5	+ Background:
	6	+ Given the following users
	7	+ \| login \| name \|
	8	+ \| jose \| Jose Wilker \|
	9	+ \| maria \| Maria Carminha \|
	10	+ And the following community
	11	+ \| identifier \| name \|
	12	+ \| mycommunity \| My Community \|
	13	+ And "Jose Wilker" is admin of "My Community"
	14	+ And I am logged in as "jose"
	15	+ And I go to mycommunity's control panel
	16	+ And I follow "Community Info and settings"
	17	+ And I check "Secret"
	18	+ And I press "Save"
	19	+ And I follow "Logout"
	20	+
	21	+ @selenium
	22	+ Scenario: Hide privacity options when secret is checked
	23	+ Given I am logged in as "jose"
	24	+ And I go to mycommunity's control panel
	25	+ And I follow "Community Info and settings"
	26	+ Then I should not see "Public — show content of this group to all internet users"
	27	+ And I should not see "Private — show content of this group only to members"
	28	+ And I uncheck "Secret"
	29	+ Then I should see "Public — show content of this group to all internet users"
	30	+ Then I should see "Private — show content of this group only to members"
	31	+
	32	+ @selenium
	33	+ Scenario: Non members shouldn't see secret communit's content
	34	+ Given I am logged in as "maria"
	35	+ And I go to mycommunity's homepage
	36	+ And I should see "Access denied"
	37	+ And I follow "Communities"
	38	+ Then I should not see "My Community"
	39	+
	40	+ Scenario: A member should see the secret community's content
	41	+ Given I am logged in as "maria"
	42	+ And "Maria Carminha" is a member of "My Community"
	43	+ And I go to maria's control panel
	44	+ And I follow "Manage my groups"
	45	+ And I follow "My Community"
	46	+ Then I should see "My Community"
	47	+
	48	+ @selenium
	49	+ Scenario: public article on a secret profile should not be displayed
	50	+ Given I am logged in as "jose"
	51	+ And I go to mycommunity's control panel
	52	+ And I follow "Manage Content"
	53	+ And I follow "New content"
	54	+ And I follow "Text article with visual editor"
	55	+ And I fill in "Title" with "My public article"
	56	+ And I choose "Public"
	57	+ And I press "Save and continue"
	58	+ When I am logged in as "maria"
	59	+ And I go to /mycommunity/my-public-article
	60	+ Then I should not see "My public article"
...	...
...	...	@@ -2,8 +2,9 @@ class BreadcrumbsPlugin::ContentBreadcrumbsBlock < Block
2	2
3	3	settings_items :show_cms_action, :type => :boolean, :default => true
4	4	settings_items :show_profile, :type => :boolean, :default => true
	5	+ settings_items :show_section_name, :type => :boolean, :default => true
5	6
6		- attr_accessible :show_cms_action, :show_profile
	7	+ attr_accessible :show_cms_action, :show_profile, :show_section_name
7	8
8	9	def self.description
9	10	_("<p>Display a breadcrumb of the current content navigation.</p><p>You could choose if the breadcrumb is going to appear in the cms editing or not.</p> <p>There is either the option of display the profile location in the breadcrumb path.</p>")
...	...	@@ -48,7 +49,18 @@ class BreadcrumbsPlugin::ContentBreadcrumbsBlock < Block
48	49	proc do
49	50	trail = block.trail(@page, @profile, params)
50	51	if !trail.empty?
51		- trail.map { \|t\| link_to(t[:name], t[:url], :class => 'item') }.join(content_tag('span', ' > ', :class => 'separator'))
	52	+ separator = content_tag('span', ' > ', :class => 'separator')
	53	+
	54	+ breadcrumb = trail.map do \|t\|
	55	+ link_to(t[:name], t[:url], :class => 'item')
	56	+ end.join(separator)
	57	+
	58	+ if block.show_section_name
	59	+ section_name = block.show_profile ? trail.second[:name] : trail.first[:name]
	60	+ breadcrumb << content_tag('div', section_name, :class => 'section-name')
	61	+ end
	62	+
	63	+ breadcrumb
52	64	else
53	65	''
54	66	end
...	...
...	...	@@ -41,4 +41,9 @@ class ProfileDesignControllerTest < ActionController::TestCase
41	41	assert !@block.show_cms_action
42	42	end
43	43
	44	+ should 'be able save breadcrumbs block with show_section_name option' do
	45	+ get :edit, :id => @block.id, :profile => @profile.identifier
	46	+ post :save, :id => @block.id, :profile => @profile.identifier, :block => {:title => 'breadcrumbs', :show_cms_action => false, :show_profile => true, :show_section_name => true }
	47	+ assert @block.show_section_name
	48	+ end
44	49	end
...	...