Permalink
Browse files

Fixed problem with layout rendering due to initialize method not call…

…ing super. Re-factored to use before_filter method to load @service_object and deleted initialize method.
  • Loading branch information...
1 parent ea34370 commit 92b3b5d11e5d54ace37c2038d4aebb909ab413d7 @dpaterson dpaterson committed Aug 2, 2012
Showing with 24 additions and 20 deletions.
  1. +24 −20 crowbar_framework/app/controllers/ipmi_controller.rb
@@ -1,20 +1,24 @@
-# Copyright 2011, Dell
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-class IpmiController < BarclampController
- def initialize
- @service_object = IpmiService.new logger
- end
-end
+# Copyright 2011, Dell
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+class IpmiController < BarclampController
+ before_filter :set_service_object
+
+ def set_service_object
+ @service_object = IpmiService.new logger
+ end
+
+ private :set_service_object
+end

0 comments on commit 92b3b5d

Please sign in to comment.