Merge branch 'next' into serpro-context

Victor Costa
2 parents db62fbb8 df49d037
Showing 21 changed files with 197 additions and 22 deletions Show diff stats
app/controllers/public/account_controller.rb
app/models/profile.rb
app/models/user.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
lib/user_activation_job.rb
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
public/javascripts/application.js
public/javascripts/profile_editor.js
test/functional/account_controller_test.rb
test/unit/profile_test.rb
test/unit/user_activation_job_test.rb
@@ -315,7 +315,11 @@ class AccountController &lt; ApplicationController
       session[:notice] = nil # consume the notice
     end
-    @plugins.each { |plugin| user_data.merge!(plugin.user_data_extras) }
+    @plugins.each do |plugin|
+      user_data_extras = plugin.user_data_extras
+      user_data_extras = instance_exec(&user_data_extras) if user_data_extras.kind_of?(Proc)
+      user_data.merge!(user_data_extras)
+    end
     render :text => user_data.to_json, :layout => false, :content_type => "application/javascript"
   end
@@ -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
+  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
   # use for internationalizable human type names in search facets
   # reimplement on subclasses
@@ -119,9 +119,9 @@ class Profile &lt; ActiveRecord::Base
     Profile.column_names.map{|n| [Profile.table_name, n].join('.')}.join(',')
   end
-  scope :visible, :conditions => { :visible => true }
+  scope :visible, :conditions => { :visible => true, :secret => false }
   scope :disabled, :conditions => { :visible => false }
-  scope :public, :conditions => { :visible => true, :public_profile => true }
+  scope :public, :conditions => { :visible => true, :public_profile => true, :secret => false }
   scope :enabled, :conditions => { :enabled => true }
   # Subclasses must override this method
@@ -159,6 +159,7 @@ class User &lt; ActiveRecord::Base
     @task.name = self.name
     @task.email = self.email
     @task.target = self.environment
+    @task.requestor = self.person
     @task.save
   end
@@ -301,6 +302,10 @@ class User &lt; ActiveRecord::Base
     end
   end
+  def moderate_registration_pending?
+    return ModerateUserRegistration.exists?(:requestor_id => self.person.id, :target_id => self.environment.id, :status => Task::Status::ACTIVE)
+  end
+
   def data_hash(gravatar_default = nil)
     friends_list = {}
     enterprises = person.enterprises.map { |e| { 'name' => e.short_name, 'identifier' => e.identifier } }
@@ -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 %>"/>
@@ -34,10 +34,13 @@
     </div>
   <% else %>
     <div>
-      <%= labelled_radio_button _('Public &mdash; show content of this group to all internet users'), 'profile_data[public_profile]', true, @profile.public_profile? %>
+      <%= 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 _('Private &mdash; show content of this group only to members'), 'profile_data[public_profile]', false, !@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?, :class => "private-community-button" %>
     </div>
   <% end %>
@@ -85,4 +88,6 @@
       <% end %>
     <% end %>
   <% end %>
-<% end %>
 \ No newline at end of file
+<% 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"
 class UserActivationJob < Struct.new(:user_id)
   def perform
     user = User.find(user_id)
-    user.destroy unless user.activated? || user.person.is_template?
+    user.destroy unless user.activated? || user.person.is_template? || user.moderate_registration_pending?
   end
 end
@@ -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
     _('Content Breadcrumbs')
@@ -40,7 +41,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
@@ -1064,7 +1064,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);
@@ -712,7 +712,9 @@ class AccountControllerTest &lt; ActionController::TestCase
     class Plugin2 < Noosfero::Plugin
       def user_data_extras
-        {:test => 5}
+        proc do
+          {:test => 5}
+        end
       end
     end
     Noosfero::Plugin.stubs(:all).returns([Plugin1.name, Plugin2.name])
@@ -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|
@@ -40,6 +40,18 @@ class UserActivationJobTest &lt; ActiveSupport::TestCase
     end
   end
+  should 'not destroy user if a moderate user registration task exists' do
+    env = Environment.default
+    env.enable('skip_new_user_email_confirmation')
+    env.enable('admin_must_approve_new_users')
+    user = new_user :login => 'test3'
+    job = UserActivationJob.new(user.id)
+    assert_no_difference 'User.count' do
+      job.perform
+      process_delayed_job_queue
+    end
+  end
+
   protected
     def new_user(options = {})
       user = User.new({ :login => 'quire', :email => 'quire@example.com', :password => 'quire', :password_confirmation => 'quire' }.merge(options))
@@ -302,6 +302,17 @@ class UserTest &lt; ActiveSupport::TestCase
     assert !user.email_activation_pending?
   end
+  should 'has moderate registration pending' do
+    user = create_user('cooler')
+    ModerateUserRegistration.create!(:requestor => user.person, :target => Environment.default)
+    assert user.moderate_registration_pending?
+  end
+
+  should 'not has moderate registration pending if not have a pending task' do
+    user = create_user('cooler')
+    assert !user.moderate_registration_pending?
+  end
+
   should 'be able to use [] operator to find users by login' do
     user = fast_create(User)
     assert_equal user, User[user.login]
	@@ -3,7 +3,7 @@		@@ -3,7 +3,7 @@
3	# which by default is the one returned by Environment:default.	3	# which by default is the one returned by Environment:default.
4	class Profile < ActiveRecord::Base	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	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
7		7
8	# use for internationalizable human type names in search facets	8	# use for internationalizable human type names in search facets
9	# reimplement on subclasses	9	# reimplement on subclasses
	@@ -119,9 +119,9 @@ class Profile < ActiveRecord::Base		@@ -119,9 +119,9 @@ class Profile < ActiveRecord::Base
119	Profile.column_names.map{\|n\| [Profile.table_name, n].join('.')}.join(',')	119	Profile.column_names.map{\|n\| [Profile.table_name, n].join('.')}.join(',')
120	end	120	end
121		121
122	- scope :visible, :conditions => { :visible => true }	122	+ scope :visible, :conditions => { :visible => true, :secret => false }
123	scope :disabled, :conditions => { :visible => false }	123	scope :disabled, :conditions => { :visible => false }
124	- scope :public, :conditions => { :visible => true, :public_profile => true }	124	+ scope :public, :conditions => { :visible => true, :public_profile => true, :secret => false }
125	scope :enabled, :conditions => { :enabled => true }	125	scope :enabled, :conditions => { :enabled => true }
126		126
127	# Subclasses must override this method	127	# Subclasses must override this method
	@@ -9,7 +9,7 @@		@@ -9,7 +9,7 @@
9	enterprise.identifier, :class => 'profile-link' %>	9	enterprise.identifier, :class => 'profile-link' %>
10	<%# profile_image_link enterprise, :portrait, 'div' %>	10	<%# profile_image_link enterprise, :portrait, 'div' %>
11	<div class="controll">	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	</div><!-- end class="controll" -->	13	</div><!-- end class="controll" -->
14	</li>	14	</li>
15	<% end %>	15	<% end %>
@@ -0,0 +1,5 @@		@@ -0,0 +1,5 @@
	1	+class AddSecretToProfile < ActiveRecord::Migration
	2	+ def change
	3	+ add_column :profiles, :secret, :boolean, :default => false
	4	+ end
	5	+end
@@ -0,0 +1,60 @@		@@ -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"
1	class UserActivationJob < Struct.new(:user_id)	1	class UserActivationJob < Struct.new(:user_id)
2	def perform	2	def perform
3	user = User.find(user_id)	3	user = User.find(user_id)
4	- user.destroy unless user.activated? \|\| user.person.is_template?	4	+ user.destroy unless user.activated? \|\| user.person.is_template? \|\| user.moderate_registration_pending?
5	end	5	end
6	end	6	end
	@@ -41,4 +41,9 @@ class ProfileDesignControllerTest < ActionController::TestCase		@@ -41,4 +41,9 @@ class ProfileDesignControllerTest < ActionController::TestCase
41	assert !@block.show_cms_action	41	assert !@block.show_cms_action
42	end	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	end	49	end
1	<div id='edit-breadcrumbs-block'>	1	<div id='edit-breadcrumbs-block'>
2	<%= labelled_form_field check_box(:block, :show_cms_action) + _('Show cms action'), '' %>	2	<%= labelled_form_field check_box(:block, :show_cms_action) + _('Show cms action'), '' %>
3	<%= labelled_form_field check_box(:block, :show_profile) + _('Show profile'), '' %>	3	<%= labelled_form_field check_box(:block, :show_profile) + _('Show profile'), '' %>
		4	+ <%= labelled_form_field check_box(:block, :show_section_name) + _('Show section name'), '' %>
4	</div>	5	</div>
	@@ -1064,7 +1064,7 @@ jQuery(document).ready(function(){		@@ -1064,7 +1064,7 @@ jQuery(document).ready(function(){
1064	function apply_zoom_to_images(zoom_text) {	1064	function apply_zoom_to_images(zoom_text) {
1065	jQuery(function($) {	1065	jQuery(function($) {
1066	$(window).load( function() {	1066	$(window).load( function() {
1067	- $('#article .article-body img').each( function(index) {	1067	+ $('#article .article-body img:not(.disable-zoom)').each( function(index) {
1068	var original = original_image_dimensions($(this).attr('src'));	1068	var original = original_image_dimensions($(this).attr('src'));
1069	if ($(this).width() < original['width'] \|\| $(this).height() < original['height']) {	1069	if ($(this).width() < original['width'] \|\| $(this).height() < original['height']) {
1070	$(this).wrap('<div class="zoomable-image" />');	1070	$(this).wrap('<div class="zoomable-image" />');
@@ -0,0 +1,26 @@		@@ -0,0 +1,26 @@
	1	+(function($){
	2	+ 'use strict';
	3	+
	4	+ function show_or_hide_privacy_radio_buttons(hide_options) {
	5	+ var public_community = $(".public-community-button").parent();
	6	+ var private_community = $(".private-community-button").parent();
	7	+ if (hide_options) {
	8	+ $(".private-community-button").selected();
	9	+ public_community.hide();
	10	+ private_community.hide();
	11	+
	12	+ } else {
	13	+ public_community.show();
	14	+ private_community.show();
	15	+ }
	16	+ }
	17	+
	18	+ $(document).ready(function(){
	19	+ var profile_secret = $(".profile-secret-box");
	20	+ show_or_hide_privacy_radio_buttons(profile_secret.is(":checked"));
	21	+ profile_secret.change(function(){
	22	+ show_or_hide_privacy_radio_buttons(this.checked);
	23	+ });
	24	+
	25	+ });
	26	+})(jQuery);
	@@ -40,6 +40,18 @@ class UserActivationJobTest < ActiveSupport::TestCase		@@ -40,6 +40,18 @@ class UserActivationJobTest < ActiveSupport::TestCase
40	end	40	end
41	end	41	end
42		42
		43	+ should 'not destroy user if a moderate user registration task exists' do
		44	+ env = Environment.default
		45	+ env.enable('skip_new_user_email_confirmation')
		46	+ env.enable('admin_must_approve_new_users')
		47	+ user = new_user :login => 'test3'
		48	+ job = UserActivationJob.new(user.id)
		49	+ assert_no_difference 'User.count' do
		50	+ job.perform
		51	+ process_delayed_job_queue
		52	+ end
		53	+ end
		54	+
43	protected	55	protected
44	def new_user(options = {})	56	def new_user(options = {})
45	user = User.new({ :login => 'quire', :email => 'quire@example.com', :password => 'quire', :password_confirmation => 'quire' }.merge(options))	57	user = User.new({ :login => 'quire', :email => 'quire@example.com', :password => 'quire', :password_confirmation => 'quire' }.merge(options))