Fixing AI2897 problems:

-Changed update_attribute to setting the attribute then 'save!' -Removed some whitespaces -The file controller/themes_controller.rb is needed because it is inherited by controller/my_profile/profile_themes_controller.rb and controller/admin/environment_themes_controller.rb, it is a generalization. Before this functionality was created, there was only one file called controller/my_profile/themes_controller.rb. (ActionItem2897) Signed-off-by: Alex de Souza <campelo.al1@gmail.com> Signed-off-by: Gustavo Jaruga <darksshades@hotmail.com>

Fixing AI2897 problems:
-Changed update_attribute to setting the attribute then 'save!' -Removed some whitespaces -The file controller/themes_controller.rb is needed because it is inherited by controller/my_profile/profile_themes_controller.rb and controller/admin/environment_themes_controller.rb, it is a generalization. Before this functionality was created, there was only one file called controller/my_profile/themes_controller.rb. (ActionItem2897) Signed-off-by: Alex de Souza <campelo.al1@gmail.com> Signed-off-by: Gustavo Jaruga <darksshades@hotmail.com>
Gust
1 parent b0874b74
Showing 4 changed files with 12 additions and 6 deletions Show diff stats
app/controllers/themes_controller.rb
app/models/environment.rb
test/functional/environment_themes_controller_test.rb
test/functional/profile_themes_controller_test.rb
@@ -5,7 +5,7 @@ class ThemesController &lt; ApplicationController
   no_design_blocks
   # attr_reader :target
-  
+
   def target
     @target
   end
@@ -679,11 +679,13 @@ class Environment &lt; ActiveRecord::Base
   end
   def update_theme(theme)
-    self.update_attribute(:theme, theme)
+    self.theme = theme
+    self.save!
   end
   def update_layout_template(template)
-    self.update_attribute(:layout_template, template)
+    self.layout_template = template
+    self.save!
   end
   before_create do |env|
@@ -96,7 +96,8 @@ class EnvironmentThemesControllerTest &lt; ActionController::TestCase
   should 'display links to set template' do
     env = Environment.default
-    env.update_attributes!(:layout_template => 'rightbar')
+    env.layout_template = 'rightbar'
+    env.save!
     t1 = LayoutTemplate.find('default')
     t2 = LayoutTemplate.find('leftbar')
     LayoutTemplate.expects(:all).returns([t1, t2])
@@ -109,6 +110,7 @@ class EnvironmentThemesControllerTest &lt; ActionController::TestCase
   should 'highlight current template' do
     env = Environment.default
     env.update_attributes!(:layout_template => 'default')
+    env.layout_template = 'default'
     t1 = LayoutTemplate.find('default')
     t2 = LayoutTemplate.find('leftbar')
@@ -254,7 +254,8 @@ class ProfileThemesControllerTest &lt; ActionController::TestCase
   end
   should 'display links to set template' do
-    profile.update_attributes!(:layout_template => 'rightbar')
+    profile.layout_template = 'rightbar'
+    profile.save!
     t1 = LayoutTemplate.find('default')
     t2 = LayoutTemplate.find('leftbar')
     LayoutTemplate.expects(:all).returns([t1, t2])
@@ -265,7 +266,8 @@ class ProfileThemesControllerTest &lt; ActionController::TestCase
   end
   should 'highlight current template' do
-    profile.update_attributes!(:layout_template => 'default')
+    profile.layout_template = 'default'
+    profile.save!
     t1 = LayoutTemplate.find('default')
     t2 = LayoutTemplate.find('leftbar')
	@@ -5,7 +5,7 @@ class ThemesController < ApplicationController		@@ -5,7 +5,7 @@ class ThemesController < ApplicationController
5	no_design_blocks	5	no_design_blocks
6		6
7	# attr_reader :target	7	# attr_reader :target
8	-	8	+
9	def target	9	def target
10	@target	10	@target
11	end	11	end