app/models/desktop.rb in erp_app-3.0.0 vs app/models/desktop.rb in erp_app-3.0.1

@@ -1,8 +1,6 @@
-class Desktop < ActiveRecord::Base
-  acts_as_app_container
-
+class Desktop < AppContainer
   BACKGROUND_IMAGES_PATH = "#{Rails.root}/public/images/wallpaper"
 
   def shortcuts
     self.applications.select{|app| app.get_user_preference(self.user, :desktop_shortcut) === 'yes'}
   end
@@ -12,31 +10,29 @@
   end
 
   def setup_default_preferences
     #setup desktop background
     desktop_backgroud_pt = PreferenceType.iid('desktop_background')
-    desktop_backgroud_pt.preferenced_records << self
-    desktop_backgroud_pt.save
+    self.preference_types << desktop_backgroud_pt
 
     pref = Preference.create(
       :preference_type => desktop_backgroud_pt,
-      :preference_option => PreferenceOption.iid('portablemind_desktop_background')
+      :preference_option => desktop_backgroud_pt.default_preference_option
     )
 
     self.user_preferences << UserPreference.create(
       :user => self.user,
       :preference => pref
     )
 
     #setup theme
     theme_pt = PreferenceType.iid('extjs_theme')
-    theme_pt.preferenced_records << self
-    theme_pt.save
+    self.preference_types << theme_pt
 
     pref = Preference.create(
       :preference_type => theme_pt,
-      :preference_option => PreferenceOption.iid('blue_extjs_theme')
+      :preference_option => theme_pt.default_preference_option
     )
 
     self.user_preferences << UserPreference.create(
       :user => self.user,
       :preference => pref
@@ -80,10 +76,11 @@
 
       result
     end
 
     def find_by_user(user)
-      find_by_user_and_klass(user, Desktop)
+      Desktop.where('user_id = ?', user.id).first
     end
+    
   end
   
 end