solved conflicts

app/models/module_app.rb

@@ -19,11 +19,10 @@ class ModuleApp
     self[:widgets] = reg.get_widgets
   end
 
-    
-  # def app_pages
-  #   get_registration.get_app_pages
-  # end
 
+  scope :for_frontend_select,where(:key.in => OrbitApp::Module::FrontendUtility.all.keys).excludes(widgets: nil).where(enable_frontend: true).order_by(:title, :asc)
+  scope :for_widget_select,where(:key.in=>OrbitApp::Module::WidgetUtility.all.keys).order_by(:title, :asc)
+  scope :standard_sorting ,order_by(:title, :asc)
 
   def enable_frontend?
     self[:enable_frontend]

app/models/page.rb

@@ -7,7 +7,7 @@ class Page < Item
   
   field :content, localize: true
   field :app_frontend_url
-  field :theme_id, :type => BSON::ObjectId, :default => nil
+  # field :theme_id, :type => BSON::ObjectId, :default => nil
   field :category,type: Array, :default => []
   field :tag, type: Array,:default => []
   field :view_count, :type => Integer, :default => 0
@@ -21,7 +21,8 @@ class Page < Item
   field :frontend_sat_to_link , :type => Array,:default => []
 
   field :frontend_data_count
-  
+
+  belongs_to :theme  
   belongs_to :design
   belongs_to :module_app
   has_many :page_parts, :dependent => :destroy