Merge branch 'nccu_master' into demo_site

Conflicts:
	Gemfile
	app/assets/javascripts/tinymce_orbit.js.erb
	app/assets/stylesheets/style.css.erb
	app/controllers/admin/assets_controller.rb
	app/controllers/admin/module_apps_new_interface_controller.rb
	app/controllers/admin/page_parts_controller.rb
	app/jobs/sync_db.rb
	app/models/page.rb
	app/models/page_part.rb
	app/models/user/user.rb
	app/uploaders/image_uploader.rb
	app/views/admin/assets/create.js.erb
	app/views/admin/module_apps/reload_frontend_pages.js.erb
	app/views/layouts/_orbit_bar.html.erb
	app/views/layouts/_side_bar.html.erb
	app/views/layouts/_users_checkbox_ary.html.erb
	app/views/shared/_privilege_user.html.erb
	config/mongoid.yml
	lib/parsers/parser_common.rb
	vendor/built_in_modules/announcement/announcement.json
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_link.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb

app/controllers/admin/assets_controller.rb

@@ -30,17 +30,19 @@ class Admin::AssetsController < OrbitBackendController
   
   def create  
     @asset = Asset.new(params[:asset])
-    @asset.filename = @asset.title[I18n.locale] rescue nil
+    @asset.filename = @asset.title rescue nil
     if @asset.filename && @asset.save
-      respond_to do |format|
-        format.js {
-          if params[:uploader]
-            render "create"
-          else
-            render 'js/remove_pop_up_and_reload_content', :locals => {:function => 'replaceWith', :id => "asset_#{@asset.id}", :value => @asset, :values => nil, :partial => 'admin/assets/asset', :locals => nil}
-          end
-        }
-      end
+      # respond_to do |format|
+      #   format.js {
+      #     if params[:uploader]
+      #       render 'create'
+      #     else
+      #       render 'js/remove_pop_up_and_reload_content', :locals => {:function => 'replaceWith', :id => "asset_#{@asset.id}", :value => @asset, :values => nil, :partial => 'admin/assets/asset', :locals => nil}
+      #     end
+      #   }
+      # end
+      # render :json=>{"url"=>@asset.data.url,"title"=>"xxx","desc"=>"sss"}.to_json
+      render :layout=>false
     else
       flash[:error] = t(:create_fail)
       @asset_categories = AssetCategory.all
@@ -85,8 +87,8 @@ class Admin::AssetsController < OrbitBackendController
   end
 
   def delete
-    if params[:to_delete]
-      asset = Asset.any_in(:_id => params[:to_delete]).delete_all
+    if params[:ids]
+      asset = Asset.any_in(:_id => params[:ids]).delete_all
     end
     redirect_to assets_url(:filter => params[:filter], :direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options])
   end

app/controllers/admin/designs_controller.rb

@@ -86,8 +86,8 @@ class Admin::DesignsController < OrbitBackendController
   end
 
   def delete
-    if params[:to_delete]
-      designs = Design.any_in(:_id => params[:to_delete]).delete_all
+    if params[:ids]
+      designs = Design.any_in(:_id => params[:ids]).delete_all
     end
     redirect_to admin_designs_url(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options])
   end

app/controllers/admin/module_apps_controller.rb

@@ -10,6 +10,7 @@ class Admin::ModuleAppsController < ApplicationController
 
 
   def reload_frontend_pages
+    @categories =[]
     @module_app = ModuleApp.find(params[:id])
 	
     @frontend_path = @module_app.widgets.keys[0] if ( !@module_app.widgets.blank? && @module_app.widgets[0].blank? )

app/controllers/admin/module_apps_new_interface_controller.rb

@@ -39,7 +39,7 @@ class Admin::ModuleAppsNewInterfaceController < OrbitBackendController
   def update_setting_by_params
     user_sat = []
     ma = ModuleApp.find params[:module_app][:id]
-    user_sat = User.find params[:users].keys if params.has_key? :users
+    user_sat += User.find params[:users].keys if params.has_key?('users')
     users_to_new = user_sat - ma.managing_users
     users_to_remove = ma.managing_users - user_sat
 
@@ -56,7 +56,7 @@ class Admin::ModuleAppsNewInterfaceController < OrbitBackendController
   def get_categorys(id = nil)
     @bulletin_categorys = []
     if(is_manager? || is_admin?)
-      @bulletin_categorys = (id ? BulletinCategory.find(id).to_a : BulletinCategory.excludes('disabled' => true))
+      @bulletin_categorys = (id ? BulletinCategory.find(id).to_a : BulletinCategory.all)
     elsif is_sub_manager?
       @bulletin_categorys = BulletinCategory.authed_for_user(current_user,'submit_new')
     end

app/controllers/admin/object_auths_new_interface_controller.rb

@@ -49,7 +49,7 @@ class Admin::ObjectAuthsNewInterfaceController < OrbitBackendController
   # def get_categorys(id = nil)
   #   @bulletin_categorys = []
   #   if(is_manager? || is_admin?)
-  #     @bulletin_categorys = (id ? BulletinCategory.find(id).to_a : BulletinCategory.excludes('disabled' => true))
+  #     @bulletin_categorys = (id ? BulletinCategory.find(id).to_a : BulletinCategory.all)
   #   elsif is_sub_manager?
   #     @bulletin_categorys = BulletinCategory.authed_for_user(current_user,'submit_new')
   #   end

app/controllers/admin/page_parts_controller.rb

@@ -56,6 +56,12 @@ class Admin::PagePartsController < ApplicationController
     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('admin.update_success_content')
+
+      if @part.page.name == 'home'
+        expire_page '/'
+      else
+        expire_page page_path(@part.page.name)
+      end
       respond_to do |format|
         format.html { 
           redirect_to admin_page_url( @part.page )
@@ -76,12 +82,13 @@ class Admin::PagePartsController < ApplicationController
   end
   
   def reload_widgets
+    @categories =[]
     @module_app = ModuleApp.find(params[:id])
 	
     @widget_path = @module_app.widgets.keys[0] if ( @module_app.widgets[0].blank? )
 	
     @widget_style =  @module_app.widgets[@widget_path] if ( !@widget_path.blank? )
-	
+
     case @module_app.key
       when 'announcement'
         @categories =  BulletinCategory.all
@@ -93,6 +100,7 @@ class Admin::PagePartsController < ApplicationController
         @categories =  WebLinkCategory.all
         @tags = WebResourceTag.all
     end
+
     respond_to do |format|
       format.js  {}
     end

app/controllers/admin/purchases_controller.rb

@@ -32,7 +32,7 @@ class Admin::PurchasesController < ApplicationController
     
     public_key = OpenSSL::PKey::RSA.new(File.read(APP_CONFIG['main_public_key']))
     encrypted_data = public_key.public_encrypt({:purchase_id => purchase.purchase_id,
-                                                :purchase_type => purchase._type,
+                                                :purchase_type => purchase.class.to_s,
                                                 :roaming_id => Site.find(session[:site]).roaming_id,
                                                 :url => url}.to_json)
     
@@ -43,7 +43,7 @@ class Admin::PurchasesController < ApplicationController
     temp_file.write response.body
     temp_file.rewind
     zip_name = response['content-disposition'].split('filename=')[1].gsub(/[\\\"]|.zip/, '') rescue ''
-    case purchase._type
+    case purchase.class.to_s
       when 'Pdesign'
         unzip_design(temp_file, zip_name)
       when 'PModuleApp'

app/controllers/admin/sites_controller.rb

@@ -1,8 +1,8 @@
 class Admin::SitesController < ApplicationController
   
   layout "new_admin"
-  before_filter :authenticate_user!
-  before_filter :is_admin?
+  before_filter :authenticate_user!, :except => [:sitemap_frontend]
+  before_filter :is_admin?, :except => [:sitemap_frontend]
   before_filter :get_site
   
   # def index
@@ -19,22 +19,40 @@ class Admin::SitesController < ApplicationController
     redirect_to :back
   end
 
+  def mail_setting
+    
+  end
+
   def site_info
     
   end
 
+  def sitemap
+    @items = get_homepage.children rescue []
+  end
+
+  def sitemap_frontend
+    @items = get_homepage.children.excludes(sitemap_enabled: false) rescue []
+    render :layout => false
+  end
+
+  def sitemap_toggle
+    @item = Item.find(params[:id])
+    @item.sitemap_enabled = !@item.sitemap_enabled
+    @item.save
+    if params[:parent]
+      @item.children.each do |child|    
+        child.sitemap_enabled = @item.sitemap_enabled
+        child.save
+      end
+    end
+    render :nothing => true
+  end
+
   def system_info
     
   end
 
-  def language
-    
-  end
-
-  def mail_setting
-    
-  end
-
   def ui_theme
     
   end