Download as
Browse Code »

Commit 281ae6cccd2aeff55fc6737ea5143a3a1acbd240

Authored by Rodrigo Souto
2 parents 8decbb48 7b1826d2
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

Merge branch 'zoom-article-image' into 'stable' 

Shows a zoom link on article images by default

https://noosfero.org/Development/ActionItem3086
Showing 3 changed files with 32 additions and 11 deletions   Show diff stats
app/models/environment.rb
  Diff comments   View file @281ae6c
... ... @@ -337,19 +337,22 @@ class Environment < ActiveRecord::Base
337 337 features.delete_if{ |k, v| !self.enabled?(k) }
338 338 end
339 339  
  340 + DEFAULT_FEATURES = %w(
  341 + disable_asset_products
  342 + disable_gender_icon
  343 + products_for_enterprises
  344 + disable_select_city_for_contact
  345 + enterprise_registration
  346 + media_panel
  347 + organizations_are_moderated_by_default
  348 + show_balloon_with_profile_links_when_clicked
  349 + show_zoom_button_on_article_images
  350 + use_portal_community
  351 + )
  352 +
340 353 before_create :enable_default_features
341 354 def enable_default_features
342   - %w(
343   - disable_asset_products
344   - disable_gender_icon
345   - products_for_enterprises
346   - disable_select_city_for_contact
347   - enterprise_registration
348   - media_panel
349   - organizations_are_moderated_by_default
350   - show_balloon_with_profile_links_when_clicked
351   - use_portal_community
352   - ).each do |feature|
  355 + DEFAULT_FEATURES.each do |feature|
353 356 enable(feature, false)
354 357 end
355 358 end
... ...
db/migrate/20140408172149_enable_show_zoom_button_on_article_images.rb 0 → 100644
  Diff comments   View file @281ae6c
... ... @@ -0,0 +1,11 @@
  1 +class EnableShowZoomButtonOnArticleImages < ActiveRecord::Migration
  2 + def self.up
  3 + Environment.find_each do |environment|
  4 + environment.enable(:show_zoom_button_on_article_images)
  5 + end
  6 + end
  7 +
  8 + def self.down
  9 + say("This migration is irreversible.")
  10 + end
  11 +end
... ...
test/unit/environment_test.rb
  Diff comments   View file @281ae6c
... ... @@ -53,6 +53,13 @@ class EnvironmentTest &lt; ActiveSupport::TestCase
53 53 assert !v.enabled?('feature1') && !v.enabled?('feature2') && !v.enabled?('feature3')
54 54 end
55 55  
  56 + def test_default_enabled_features_are_enabled
  57 + environment = Environment.create(:name => 'Testing')
  58 + Environment::DEFAULT_FEATURES.each do |features|
  59 + assert environment.enabled?(features)
  60 + end
  61 + end
  62 +
56 63 def test_name_is_mandatory
57 64 v = Environment.new
58 65 v.valid?
... ...