Download as
Browse Code »

Commit bd33b5fb415e086f15864ccc08087a65e63ab3ed

Authored by Joenio Costa
1 parent c3e66f14
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

Theme isn't a setting of environment (reverting mistake made by commit d273ad) 

(ActionItem1592)
Showing 4 changed files with 18 additions and 3 deletions   Show diff stats
app/models/environment.rb
  Diff comments   View file @bd33b5f
@@ -205,7 +205,6 @@ class Environment < ActiveRecord::Base @@ -205,7 +205,6 @@ class Environment < ActiveRecord::Base
205 settings_items :description, :type => String 205 settings_items :description, :type => String
206 settings_items :category_types, :type => Array, :default => ['Category'] 206 settings_items :category_types, :type => Array, :default => ['Category']
207 settings_items :enable_ssl 207 settings_items :enable_ssl
208 - settings_items :theme, :type => String, :default => 'default'  
209 settings_items :icon_theme, :type => String, :default => 'default' 208 settings_items :icon_theme, :type => String, :default => 'default'
210 settings_items :local_docs, :type => Array, :default => [] 209 settings_items :local_docs, :type => Array, :default => []
211 settings_items :news_amount_by_folder, :type => Integer, :default => 4 210 settings_items :news_amount_by_folder, :type => Integer, :default => 4
db/migrate/20100722020357_add_default_value_for_environment_theme.rb 0 → 100644
  Diff comments   View file @bd33b5f
@@ -0,0 +1,9 @@ @@ -0,0 +1,9 @@
  1 +class AddDefaultValueForEnvironmentTheme < ActiveRecord::Migration
  2 + def self.up
  3 + change_column :environments, :theme, :string, :default => 'default'
  4 + end
  5 +
  6 + def self.down
  7 + change_column :environments, :theme, :string, :default => nil
  8 + end
  9 +end
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
9 # 9 #
10 # It's strongly recommended to check this file into your version control system. 10 # It's strongly recommended to check this file into your version control system.
11 11
12 -ActiveRecord::Schema.define(:version => 20100621235235) do 12 +ActiveRecord::Schema.define(:version => 20100722020357) do
13 13
14 create_table "article_versions", :force => true do |t| 14 create_table "article_versions", :force => true do |t|
15 t.integer "article_id" 15 t.integer "article_id"
@@ -182,7 +182,7 @@ ActiveRecord::Schema.define(:version =&gt; 20100621235235) do @@ -182,7 +182,7 @@ ActiveRecord::Schema.define(:version =&gt; 20100621235235) do
182 t.text "design_data" 182 t.text "design_data"
183 t.text "custom_header" 183 t.text "custom_header"
184 t.text "custom_footer" 184 t.text "custom_footer"
185 - t.string "theme" 185 + t.string "theme", :default => "default"
186 t.text "terms_of_use_acceptance_text" 186 t.text "terms_of_use_acceptance_text"
187 t.datetime "created_at" 187 t.datetime "created_at"
188 t.datetime "updated_at" 188 t.datetime "updated_at"
test/unit/environment_test.rb
  Diff comments   View file @bd33b5f
@@ -972,4 +972,11 @@ class EnvironmentTest &lt; Test::Unit::TestCase @@ -972,4 +972,11 @@ class EnvironmentTest &lt; Test::Unit::TestCase
972 assert_equal '.', env.currency_delimiter 972 assert_equal '.', env.currency_delimiter
973 end 973 end
974 974
  975 + should 'set a new theme' do
  976 + env = fast_create(Environment)
  977 + env.theme = 'another'
  978 + env.save! && env.reload
  979 + assert_equal 'another', env.theme
  980 + end
  981 +
975 end 982 end