Commit for Basic Site

This commit is contained in:
saurabhbhatia 2013-12-16 16:08:12 +08:00
parent dccb9c75d8
commit fd24fbe082
8 changed files with 18 additions and 7 deletions

View File

@ -26,6 +26,7 @@ gem "geocoder"
gem 'mini_magick' gem 'mini_magick'
gem 'mongoid', '> 2.1', '< 3.0.0' gem 'mongoid', '> 2.1', '< 3.0.0'
gem 'mongoid_search', '~> 0.2.8'
gem 'mongoid-tree', :require => 'mongoid/tree' gem 'mongoid-tree', :require => 'mongoid/tree'
gem "mongo_session_store-rails3", '3.0.6' gem "mongo_session_store-rails3", '3.0.6'
gem 'nokogiri' gem 'nokogiri'
@ -42,8 +43,11 @@ gem 'resque-restriction'
# gem 'ruby-debug19' # gem 'ruby-debug19'
gem 'rubyzip', '< 1.0.0' gem 'rubyzip', '< 1.0.0'
gem 'sunspot_mongo' gem 'sunspot_mongoid2'
gem 'sunspot_solr' # gem 'sunspot_mongo'
gem 'sunspot_solr', github: 'sunspot/sunspot', branch: 'master'
gem 'sunspot_rails', github: 'sunspot/sunspot', branch: 'master'
gem 'progress_bar' gem 'progress_bar'
gem 'sinatra' gem 'sinatra'

View File

@ -104,7 +104,7 @@ class Admin::PagePartsController < OrbitBackendController
def update def update
@part = PagePart.find(params[:id]) @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 # 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]) if @part.update_attributes(params[:page_part])
set_children_sub_menu(@part) if @part.public_r_tag && @part.public_r_tag.eql?('sub_menu') set_children_sub_menu(@part) if @part.public_r_tag && @part.public_r_tag.eql?('sub_menu')
flash.now[:notice] = t('update.success.content') flash.now[:notice] = t('update.success.content')

View File

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

View File

@ -0,0 +1,2 @@
Sunspot.session = Sunspot::Rails.build_session
ActionController::Base.module_eval { include(Sunspot::Rails::RequestLifecycle) }

View File

@ -3,7 +3,8 @@ Orbit::Application.routes.draw do
# get "robots.txt" => 'robots#index' # get "robots.txt" => 'robots#index'
devise_for :users, :controllers => { :registrations => "registrations", :confirmations => 'confirmations' } do devise_for :users, :controllers => { :registrations => "registrations", :confirmations => 'confirmations', :passwords => 'passwords' } do
resources :passwords
match "/users_passwd" => "desktop/registrations#update", :as => :users_passwd, :via => :put match "/users_passwd" => "desktop/registrations#update", :as => :users_passwd, :via => :put
end end

View File

@ -3,7 +3,9 @@ class Bulletin
include Mongoid::Document include Mongoid::Document
include Mongoid::Timestamps include Mongoid::Timestamps
include Mongoid::MultiParameterAttributes include Mongoid::MultiParameterAttributes
include Sunspot::Mongo # include Mongoid::FullTextSearch
include Mongoid::Search
include Sunspot::Mongoid2
include Impressionist::Impressionable include Impressionist::Impressionable
include OrbitCategory::Categorizable include OrbitCategory::Categorizable
@ -37,6 +39,7 @@ class Bulletin
validates :title, :at_least_one => true validates :title, :at_least_one => true
search_in :title, :subtitle, :text
#before_save :clean_values, :save_bulletin_links, :save_bulletin_files #before_save :clean_values, :save_bulletin_links, :save_bulletin_files
searchable do searchable do

View File

@ -4,7 +4,7 @@ class ArchiveFile
include Mongoid::Timestamps include Mongoid::Timestamps
include Mongoid::MultiParameterAttributes include Mongoid::MultiParameterAttributes
include Mongoid::Sortable include Mongoid::Sortable
include Sunspot::Mongo include Sunspot::Mongoid2
include OrbitCategory::Categorizable include OrbitCategory::Categorizable
include OrbitModel::LanguageRestrict include OrbitModel::LanguageRestrict

View File

@ -3,7 +3,7 @@ class WebLink
include Mongoid::Document include Mongoid::Document
include Mongoid::Timestamps include Mongoid::Timestamps
include Mongoid::MultiParameterAttributes include Mongoid::MultiParameterAttributes
include Sunspot::Mongo include Sunspot::Mongoid2
include OrbitCategory::Categorizable include OrbitCategory::Categorizable
include OrbitModel::LanguageRestrict include OrbitModel::LanguageRestrict