Commit for Basic Site

app/controllers/admin/page_parts_controller.rb

@@ -104,7 +104,7 @@ class Admin::PagePartsController < OrbitBackendController
   def update
     @part = PagePart.find(params[:id])
     # Sometimes category is passed into params[:page], so this line makes sure it will also be in params[:page_part] too
-    # params[:page_part][:category] ||= params[:page][:category] if
+    # params[:page_part][:category] ||= params[:page][:category]
     if @part.update_attributes(params[:page_part])
       set_children_sub_menu(@part) if @part.public_r_tag && @part.public_r_tag.eql?('sub_menu')
       flash.now[:notice] = t('update.success.content')

app/models/user/user.rb

@@ -22,6 +22,7 @@ class User
   field :cache_dept,type: Hash
   field :status_record,type: Hash
   field :approved, type: Boolean, :default => false
+  field :reset_password_sent_at, :type => Time 
 
   has_and_belongs_to_many :approving_apps, class_name: 'AuthApproval', inverse_of: 'authorized_users'
   has_and_belongs_to_many :managing_apps, class_name: 'AuthManager', inverse_of: 'authorized_users'