ntue mail cron & log filter fix

.gitignore

@@ -14,9 +14,7 @@ public/uploads/**/*
 solr/data
 tmp/**/*
 uploads/**/*
-config/*.god
-log/*.gz
-tmp/restart.txt
+
 *.swp
 *.pid
 *.lck

Gemfile

@@ -16,11 +16,7 @@ gem 'execjs'
 gem 'jquery-rails', '2.1.4'
 gem 'jquery-ui-rails'
 gem "select2-rails", '3.3.1'
-gem 'kaminari'
-gem "acts_as_unvlogable"
-gem 'youtube_it'
-gem 'gotcha'
-
+gem 'kaminari', :git => 'git://github.com/amatsuda/kaminari.git'
 
 # gem "memcached", "~> 1.4.3"
 # gem "memcache-client"
@@ -41,7 +37,7 @@ gem 'resque-scheduler' # job scheduling
 gem 'resque-restriction'
 #gem 'rb-readline'
 # gem 'ruby-debug19'
-gem 'rubyzip','0.9.9'
+gem 'rubyzip'
 
 gem 'sunspot_mongo'
 gem 'sunspot_solr'
@@ -52,7 +48,7 @@ gem 'sinatra'
 gem 'sprockets'
 gem 'social-share-button'
 
-gem 'tinymce-rails', '3.5.8.3'
+gem 'tinymce-rails', "~> 3.5.8"
 gem 'therubyracer' if RUBY_PLATFORM.downcase.include?("linux")
 gem 'libv8', '~> 3.11.8' if RUBY_PLATFORM.downcase.include?("linux")
 gem 'mongoid-encryptor', :require => 'mongoid/encryptor'

app/assets/stylesheets/application.css

@@ -5,4 +5,3 @@
  *= require_self
  *= require social-share-button 
 */
-

app/controllers/default_widget_controller.rb

@@ -11,21 +11,23 @@ class DefaultWidgetController< OrbitWidgetController
   end
 
   def query_for_default_widget
-    @ori_class_name =  @default_widget["query"].split('.')[0]
-    @result =  eval(@default_widget["query"])
+
+    @ori_class_name = @default_widget["query"].split('.')[0]
+    result = nil
+    result_objects = nil
+
     if !params["tag_id"].blank?
       if params["category_id"].blank? #has tag no cate
-        @result.selector[:tagged_ids] = { "$in" => params['tag_id'] }
+        result = @ori_class_name.constantize.where(:tagged_ids.in => params["tag_id"])
       else #has tag and cate
-        @result.selector[get_category_field_name] = { "$in" => params['category_id'].collect{|t| BSON::ObjectId(t)}}
-        @result.selector[:tagged_ids] = { "$in" => params['tag_id'] }
+        result = eval("#{@ori_class_name}.where(:#{get_category_field_name}.in=>params['category_id'], :tagged_ids.in => params['tag_id'])")
       end
     elsif params["category_id"].blank?  #no tag no cate
+      result = eval(@default_widget["query"])
     else #no tag has cate
-      
-      @result.selector[get_category_field_name] = { "$in" => params['category_id'].collect{|t| BSON::ObjectId(t)}}
+      result = eval("#{@ori_class_name}.where(:#{get_category_field_name}.in=>params['category_id'])")
     end
-    eval("@result.#{@default_widget[:sorting_query]}")
+    result.available_for_lang(I18n.locale).can_display.desc(:is_top, :postdate)
   end
 
   def search_result
@@ -38,13 +40,9 @@ class DefaultWidgetController< OrbitWidgetController
 
   def default_widget
     @search = params["search_query"].blank?  ?  false : true
-    if !params[:id].blank? and !params["clicked_field_name"].blank?
+    if !params[:id].blank?
       clicked_field_name = params["clicked_field_name"].to_sym
       redirect_to eval("#{@page_part.module_app.widget_fields_link_method[clicked_field_name][:method]}('#{params[:id]}', {inner: #{params[:inner] || true}})")
-    elsif !params[:id].blank? and params["preview"]
-      clicked_field_name = :title
-      @preview_pages = @page_part.module_app.widget_fields_link_method.find_all{|t| t[1].has_key?(:preview)}.collect{|t| t[0]}
-      redirect_to eval("#{@page_part.module_app.widget_fields_link_method[clicked_field_name][:method]}('#{params[:id]}', {preview: true,inner: #{params[:inner] || true},clicked_field_name: '#{@preview_pages.first.to_s}'})")      
     else
       @tag_class = nil
       @default_widget = @page_part.module_app.get_default_widget
@@ -93,9 +91,9 @@ class DefaultWidgetController< OrbitWidgetController
   end
   
   def get_category_field_name
-    @ori_class_name = @ori_class_name.constantize unless @ori_class_name.is_a? Class
+    @ori_class_name = @ori_class_name.constantize
     @ori_class_name.fields.each_key do |key|
-      return key.to_s if key.include?('category_id')
+      return key if key.include?('category_id')
     end
     nil
   end

app/controllers/front_controller.rb

@@ -73,7 +73,7 @@ class FrontController < ApplicationController
     res << " active" if (current_page.id.eql?(page.id) || current_page.descendant_of?(page))
     res << "'>"
     root = "/"
-    res << "<a href='#{(page.class.to_s.eql?('Page') ? root + page.path : page.url)}' target=#{(page.class.to_s.eql?('Page') ? '_self' : '_blank')} ><span>#{page.title}</span></a>"
+    res << "<a href='#{(page.class.to_s.eql?('Page') ? root + page.path : page.url)}'><span>#{page.title}</span></a>"
     if page.visible_children.size > 0 && current < menu.levels
       res << "<span class='dot'></span>"
       res << menu_level(page, current_page, current + 1, menu)

app/controllers/orbit_frontend_component_controller.rb

@@ -7,10 +7,4 @@ class OrbitFrontendComponentController< ApplicationController
     @app_title = request.fullpath.split('/')[2]
   end
   
-  def delay_impressionist(item)
-    user_id = current_user.nil? ? nil : current_user.id
-    Resque.enqueue(DelayedImpressionist,:request=>DelayImpressionistRequest.new(request),:obj=>item,:class=>item.class.to_s,:controller_name=>controller_name,:action_name=>action_name,:user=>user_id)
-  end
-
-
 end

app/controllers/pages_controller.rb

@@ -44,13 +44,29 @@ class PagesController < ApplicationController
     #  render :file => "#{Rails.root}/public/404.html", :status => :not_found
     #end
   end
+   
+  def convert_array_param(key,array)
+    array.collect{|t| "#{key}[]=#{t}"}.join("&")
+  end
 
   def index_from_link
     url = "/#{@item.path}"
     options = ''
     options << "#{options.blank? ? '?' : '&'}page_main=#{params[:page_main]}" unless params[:page_main].blank?
-    options << "#{options.blank? ? '?' : '&'}#{convert_array_param('category_id', params[:category_id])}" unless params[:category_id].blank?
-    options << "#{options.blank? ? '?' : '&'}#{convert_array_param('tag_id', params[:tag_id])}" unless params[:tag_id].blank?
+
+    if params[:category_id].is_a? Array
+      options << "#{options.blank? ? '?' : '&'}#{convert_array_param('category_id',params[:category_id])}" unless params[:category_id].blank?
+      elsif params[:category_id].is_a? String
+        options << "#{options.blank? ? '?' : '&'}category_id=#{params[:category_id]}" unless params[:category_id].blank?
+    end
+    
+    if params[:tag_id].is_a? Array
+      options << "#{options.blank? ? '?' : '&'}#{convert_array_param('tag_id',params[:tag_id])}" unless params[:tag_id].blank?
+      elsif params[:category_id].is_a? String
+        options << "#{options.blank? ? '?' : '&'}tag_id=#{params[:tag_id]}" unless params[:tag_id].blank?
+    end
+    
+
     options << "#{options.blank? ? '?' : '&'}search_query=#{params[:search_query]}" unless params[:search_query].blank?
     options << "#{options.blank? ? '?' : '&'}name=#{params[:name]}" unless params[:name].blank?
     uri = URI::escape(url + options)
@@ -62,8 +78,8 @@ class PagesController < ApplicationController
     url = "/#{@item.path}"
     options = ''
     options << "#{options.blank? ? '?' : '&'}id=#{params[:id]}" unless params[:id].blank?
-    options << "#{options.blank? ? '?' : '&'}#{convert_array_param('category_id', params[:category_id])}" unless params[:category_id].blank?
-    options << "#{options.blank? ? '?' : '&'}#{convert_array_param('tag_id', params[:tag_id])}" unless params[:tag_id].blank?
+    options << "#{options.blank? ? '?' : '&'}category_id=#{params[:category_id]}" unless params[:category_id].blank?
+    options << "#{options.blank? ? '?' : '&'}tag_id=#{params[:tag_id]}" unless params[:tag_id].blank?
     options << "#{options.blank? ? '?' : '&'}preview=#{params[:preview]}" unless params[:preview].blank?
     options << "#{options.blank? ? '?' : '&'}controller_action=#{params[:controller_action]}" unless params[:controller_action].blank?
     options << "#{options.blank? ? '?' : '&'}clicked_field_name=#{params[:clicked_field_name]}" unless params[:clicked_field_name].blank?
@@ -82,43 +98,23 @@ class PagesController < ApplicationController
     elsif params[:same_page_id]
       @item = Item.find(params[:same_page_id])
     else
-      category_ids = Array(params[:category_id]) unless params[:category_id].nil?
-      tag_ids = Array(params[:tag_id]) unless params[:tag_id].nil?
+      category_ids = params[:category_id].is_a?(Array) ? params[:category_id] : [params[:category_id]]
+      tag_ids = params[:tag_id].is_a?(Array) ? params[:tag_id] : [params[:tag_id]]
       module_app = ModuleApp.first(:conditions => {:key => params[:app_name]})
-
-      default_query = { is_published: true, module_app_id: module_app.id, :app_frontend_url.in => [params[:app_action], 'default_widget'] }
-      specific_categories = { :category => category_ids }
-      in_categories = { :category.in => category_ids }
-      nil_categories = { :category.in => [nil, []] }
-      specific_tags = { :tag => tag_ids }
-      in_tags = { :tag.in => tag_ids }
-      nil_tags = { :tag.in => [nil, []] }
-
       if !category_ids.blank? && !tag_ids.blank?
-        @item = Item.where(default_query.merge(specific_categories).merge(specific_tags)).first
-        @item = Item.where(default_query.merge(specific_categories).merge(in_tags)).first unless @item
-        @item = Item.where(default_query.merge(specific_categories).merge(nil_tags)).first unless @item
-        @item = Item.where(default_query.merge(specific_tags).merge(in_categories)).first unless @item
-        @item = Item.where(default_query.merge(specific_tags).merge(nil_categories)).first unless @item
-        @item = Item.where(default_query.merge(in_categories).merge(in_tags)).first unless @item
-        @item = Item.where(default_query.merge(in_categories).merge(nil_tags)).first unless @item
-        @item = Item.where(default_query.merge(in_tags).merge(nil_categories)).first unless @item
+        @item = Item.first(:conditions => {:module_app_id => module_app.id, :app_frontend_url => params[:app_action], :category.in => category_ids, :tag.in => tag_ids})
+        @item = Item.first(:conditions => {:module_app_id => module_app.id, :app_frontend_url => params[:app_action], :category.in => category_ids, :tag.in => [nil, []]}) unless @item
       elsif !category_ids.blank?
-        @item = Item.where(default_query.merge(specific_categories).merge(nil_tags)).first
-        @item = Item.where(default_query.merge(specific_categories)).first unless @item
-        @item = Item.where(default_query.merge(in_categories).merge(nil_tags)).first unless @item
-        @item = Item.where(default_query.merge(in_categories)).first unless @item
+        @item = Item.where(module_app_id: module_app.id, app_frontend_url: params[:app_action], :category.in => category_ids).any_in(tag: [nil, []]).first
       elsif !tag_ids.blank?
-        @item = Item.where(default_query.merge(specific_tags).merge(nil_categories)).first
-        @item = Item.where(default_query.merge(specific_tags)).first unless @item
-        @item = Item.where(default_query.merge(in_tags).merge(nil_categories)).first unless @item
-        @item = Item.where(default_query.merge(in_tags)).first unless @item
+        @item = Item.where(module_app_id: module_app.id, app_frontend_url: params[:app_action], :tag.in => tag_ids).any_in(category: [nil, []]).first
       end
       @item = Item.find(params[:orig_page]) unless @item || params[:orig_page].blank?
-      @item = Item.where(default_query.merge(nil_categories).merge(nil_tags)).first unless @item
-      @item = Item.where(default_query).first unless @item
+      @item = Item.where(module_app_id: module_app.id, app_frontend_url: params[:app_action]).all_of("tag" => {"$in" => [nil, []]},"category" => { "$in" => [nil, []]}).first unless @item
+      @item = Item.where(module_app_id: module_app.id, app_frontend_url: 'default_widget').first unless @item
+      @item = Item.where(module_app_id: module_app.id, app_frontend_url: params[:app_action]).first unless @item
     end
-    raise PageError, 'Missing Frontend Page' if @item.nil?
+    raise PageError,'Missing Frontend Page' if @item.nil?
   end
   
   def save_from_no_lang_for_page

app/helpers/application_helper.rb

@@ -1,5 +1,5 @@
 module ApplicationHelper
-  include OrbitApp::Module::VisitorCounter
+
   FLASH_NOTICE_KEYS = [:error, :notice, :warning]
 
 
@@ -7,9 +7,8 @@ module ApplicationHelper
     request.referer.include?('?') ?   [request.referer,param_hash.to_param].join('&') : [request.referer,param_hash.to_param].join('?')
   end
 
-  def delayed_impressionist(item)
-    user_id = current_user.nil? ? nil : current_user.id
-    Resque.enqueue(DelayedImpressionist,:request=>DelayImpressionistRequest.new(request),:obj=>item,:class=>item.class.to_s,:controller_name=>controller_name,:action_name=>action_name,:user=>user_id)
+  def delayed_impressionist(object)
+    # Resque.enqueue_at(1.minute.from_now,DelayedImpressionist,object)
   end
 
   def check_user_role_enable(attribute_fields)
@@ -243,27 +242,25 @@ module ApplicationHelper
     "#{t(:view_count)}: #{object.view_count}"
   end
 
-  # def display_visitors(options={})
-  #   # Impression.where(options).and(:referrer.ne => nil).distinct(:session_hash).count
-  #   impressions = Impression.where(options).and(:referrer.ne => nil)
-  #   impressions.map{|i| i[:session_hash]}.uniq.count
-  # end
+  def display_visitors(options={})
+    Impression.where(options).and(:referrer.ne => nil).distinct(:session_hash).count
+  end
 
-  # def display_visitors_today
-  #   display_visitors(created_at: {'$gte' => Date.today.beginning_of_day, '$lte' => Date.today.end_of_day})
-  # end
+  def display_visitors_today
+    display_visitors(created_at: {'$gte' => Date.today.beginning_of_day, '$lte' => Date.today.end_of_day})
+  end
 
-  # def display_visitors_this_week
-  #   display_visitors(created_at: {'$gte' => Date.today.beginning_of_week, '$lte' => Date.today.end_of_week})
-  # end
+  def display_visitors_this_week
+    display_visitors(created_at: {'$gte' => Date.today.beginning_of_week, '$lte' => Date.today.end_of_week})
+  end
 
-  # def display_visitors_this_month
-  #   display_visitors(created_at: {'$gte' => Date.today.beginning_of_month, '$lte' => Date.today.end_of_month})
-  # end
+  def display_visitors_this_month
+    display_visitors(created_at: {'$gte' => Date.today.beginning_of_month, '$lte' => Date.today.end_of_month})
+  end
 
-  # def display_visitors_this_year
-  #   display_visitors(created_at: {'$gte' => Date.today.beginning_of_year, '$lte' => Date.today.end_of_year})
-  # end
+  def display_visitors_this_year
+    display_visitors(created_at: {'$gte' => Date.today.beginning_of_year, '$lte' => Date.today.end_of_year})
+  end
 
   def display_date_time(object)
     object.strftime("%Y-%m-%d %H:%M")
@@ -314,8 +311,4 @@ module ApplicationHelper
     link_to title, params.merge({direction: direction, sort: column, sort_options: column}), {:class => "#{css_class} sortable", :remote => options[:remote]}
   end
 
-  def convert_array_param(key, array)
-    Array(array).collect{|t| "#{key}[]=#{t}"}.join("&")
-  end
-
 end

app/helpers/default_widget_helper.rb

@@ -3,13 +3,6 @@ module DefaultWidgetHelper
     I18n.t("#{@page_part.module_app.key}.default_widget.#{field}")
   end
 
-  def get_top_hot_class(row_data)
-    class_attr = []
-    class_attr << 'data_is_hot' if( row_data.is_hot? rescue false )
-    class_attr << 'data_is_top' if( row_data.is_top? rescue false)
-    return class_attr.join(" ")
-  end
-
   def link_to_field(row_data,field, switch, options=nil)
     method_ary = @page_part.module_app.widget_fields_link_method
     field = field.to_sym
@@ -84,13 +77,4 @@ module DefaultWidgetHelper
       content_tag(:span,get_display(row_data,field_setting),:class=>field_setting[:class])
     end
   end
-
-  def get_row_category(row_data)
-    row_data.send("#{row_data.class.to_s.underscore}_category_id") rescue nil
-  end
-
-  def get_row_tags(row_data)
-    row_data.tagged_ids rescue nil
-  end
-
 end

app/jobs/backup_server.rb

@@ -2,24 +2,16 @@ class BackupServer
   @queue = :high
 
   def self.perform()
+    #CronMail.time_check("Going to backup Orbit").deliver
     dbhost = Mongoid.config.database.connection.primary.join ':'
     dbname = Mongoid.config.database.name
     archive_db_list_path = OrbitSystemPreference::ArchiveDbListPath
     dbdirectory = "#{Rails.root}/tmp/#{dbname}-"+Time.now.strftime("%Y-%m-%d-%H-%M")
     %x[mongodump -h #{dbhost} -d #{dbname} -o #{dbdirectory} ]
 
-    Dir.foreach('tmp') do |item|
-      date_str = item.to_s.gsub("#{dbname}-",'')
-      next if not date_str.match(/\d{4}-\d{2}-\d{2}-\d{2}-\d{2}/)
-      if Date.parse(date_str).to_time < Site.first.backup_keep_for_days.days.ago
-        OrbitLogger.info  "Deleting #{date_str}"
-        %x[rm -rf tmp/#{item}] 
-      end
-    end
-
-
-    %x[rm -f #{archive_db_list_path}]
-    %x[cd tmp ; ls -l |grep #{dbname} | awk '{print $8}'|xargs  du -h --block-size=1M --max-depth=0 |sort -h >> #{archive_db_list_path}]
+    %x[rm #{archive_db_list_path}]
+    %x[ls #{Rails.root}/tmp/#{dbname}* | du -h --max-depth=1 --block-size=1M |sort -h >> #{archive_db_list_path}]
     OrbitLogger.info "DB backup done Path:#{dbdirectory}"
+    
   end
 end

app/jobs/dashboard_counter.rb

@@ -1,21 +1,36 @@
 class DashboardCounter < Resque::Plugins::RestrictionJob
-  extend OrbitApp::Module::VisitorCounterEval
-
   @queue = :high
 
   def self.perform(*args)
     site = Site.first
     obj = new(*args)
-    site.visitor_counters[:total] = display_visitors
-    site.visitor_counters[:today] = display_visitors_today 
-    site.visitor_counters[:this_week] = display_visitors_this_week 
-    site.visitor_counters[:this_month] = display_visitors_this_month 
-    site.visitor_counters[:this_year] = display_visitors_this_year
+    site.dashboard_counter[:visitors_this_week] = obj.display_visitors_this_week 
+    site.dashboard_counter[:visitors_this_month] = obj.display_visitors_this_month 
+    site.dashboard_counter[:visitors_this_year] = obj.display_visitors_this_year
     site.save
-    OrbitLogger.info "DashboardCounter done #{site.visitor_counters.to_s}"
+    OrbitLogger.info "DashboardCounter done #{site.dashboard_counter.to_s}"
+  end
 
-    #Notice this is mainly used at user dashbroad. however the code there is currentlly using realtime evaluation.
-    #and the site model will need a field call dashboard_counter to complete this job.
+
+  def display_visitors(options={})
+    impressions = Impression.where(options).and(:referrer.ne => nil)
+    impressions.map{|i| i[:session_hash]}.uniq.count
+  end
+
+  def display_visitors_today
+    display_visitors(created_at: {'$gte' => Date.today.beginning_of_day, '$lte' => Date.today.end_of_day})
+  end
+
+  def display_visitors_this_week
+    display_visitors(created_at: {'$gte' => Date.today.beginning_of_week, '$lte' => Date.today.end_of_week})
+  end
+
+  def display_visitors_this_month
+    display_visitors(created_at: {'$gte' => Date.today.beginning_of_month, '$lte' => Date.today.end_of_month})
+  end
+
+  def display_visitors_this_year
+    display_visitors(created_at: {'$gte' => Date.today.beginning_of_year, '$lte' => Date.today.end_of_year})
   end
 
 end

app/jobs/delayed_impressionist.rb

@@ -1,51 +1,7 @@
-class DelayedImpressionist
-  def self.before_filter(*args)
-    return
-  end
-
-  include ImpressionistController::InstanceMethods
-    @queue = :low
-
-  def initialize(request,controller_name,action_name,user,obj)
-    @controller_name = controller_name
-    @action_name = action_name
-    @user = User.find user unless user.nil?
-    @request =   request
-  end 
-
-  def self.perform(*args)
-    arg = args[0]
-    @request= DelayImpressionistRequest.new
-    @request.restore(arg["request"])
-    obj = eval("#{arg["class"]}.find '#{arg['obj']['_id']}'")
-    # imp = new(@request,arg["controller_name"],arg["action_name"],arg["user"],obj)
-    new_impression = obj.impressions.build(:user_id=>arg["user"],:controller_name=>arg["controller_name"],:action_name=>arg["action_name"],:ip_address=>@request.remote_ip,:referrer=>@request.referer)
-    @try = 1
-    loop do
-        result = new_impression.save rescue false
-        break if (result || @try >= 10)
-        @try = @try + 1
-        puts "trying:#{@try}"
-    end
-    new_impression.save
-    obj.update_attribute(:view_count,obj.impression_count)
-  end
-
-private
-  def user
-    @user
-  end
-
-  def action_name
-    @action_name
-  end
-
-  def controller_name
-    @controller_name
-  end
-
-  def request
-    @request
-  end
-
+class DelayedImpressionist 
+ @queue = :low
+ def self.perform(object)  
+   impressionist(object)
+    true
+ end
 end

app/jobs/update_tag_cloud.rb

@@ -3,7 +3,7 @@ class UpdateTagCloud
 
   def self.perform()
     Tag.all.each do |tag|
-      tag.update_attribute(:cloud_view_count, tag.get_impressionist)
+      tag.update_attribute(:cloud_view_count, tag.impressionist_count(:created_at.gte => 14.days.ago, :created_at.lte => Time.now))
     end
     OrbitLogger.info "UpdateTagCloud Done"
   end

app/mailer/mail_cron_mailer.rb

@@ -62,7 +62,7 @@ class MailCronMailer < ActionMailer::Base
       @mail_cron_log = {  
         :mail_subject => @data.mail_subject,
         :mail_to => group_mail,
-        :mail_user => @user.name,
+        :mail_user => @user.user_id,
         :mailer_count => group_mail.split(",").size,
         :mail_from_app => @data.mail_from_app 
       } 

app/models/mail_cron.rb

@@ -29,42 +29,4 @@ class MailCron
       end
     end
   end
-
-  def self.send_mail_now(mail_cron_id)
-
-    mail_data = MailCron.find(mail_cron_id)
-
-    if !mail_data.blank?
-
-      @mail_j = 0
-      @read_mails = Array.new 
-
-      @mails = mail_data.mail_to.split(",")
-
-      @mails.each do |send_mail|
-
-        @read_mails << send_mail
-
-        @mail_j += 1 
-
-        if  0 == @mail_j % 30 
-          MailCronMailer.cron_mail( mail_data.id, @read_mails.join(',') ).deliver
-          @read_mails = Array.new
-
-          sleep 10
-        end
-
-      end
-
-      if !@read_mails.join(',').blank?
-        MailCronMailer.cron_mail( mail_data.id, @read_mails.join(',') ).deliver
-        @read_mails = Array.new
-
-        sleep 10
-      end  
-
-    end  
-    
-  end
-
 end

app/models/module_app.rb

@@ -140,7 +140,7 @@ class ModuleApp
   def sorted_tags_for_cloud
     temp_tags = {}
     self.tags.each{ |tag|
-      temp_tags.merge!({tag => tag.cloud_view_count})
+      temp_tags.merge!({tag => Tag.get_impressionist(tag)})
     }
     if !temp_tags.blank?
       sorted_tags = temp_tags.sort{|a,b| a[1]<=>b[1]}.reverse

app/models/page.rb

@@ -3,7 +3,7 @@ class Page < Item
   include Impressionist::Impressionable
   include ParserFrontEnd
   
-  is_impressionable #:counter_cache => { :column_name => :view_count }
+  is_impressionable :counter_cache => { :column_name => :view_count }
   
   field :content, localize: true
   field :app_frontend_url

app/models/site.rb

@@ -18,7 +18,6 @@ class Site
   field :title_always_on, :type => Boolean, :default => false
   field :dashbroad_allow_visitor, :type => Boolean, :default => false
   field :mail_settings, :type => Hash
-  field :visitor_counters,:type=> Hash,:default=>{:total=>0,:today=>0,:this_week=>0,:this_month=>0,:this_year=>0}
 
   field :disk_space, :type => String
   field :system_package_info, :type => Hash,:default=>{}
@@ -29,11 +28,10 @@ class Site
   mount_uploader :default_image, ImageUploader
 
   field :search,:type => Hash
-  field :resque_namespace,:type => String, :default=>APP_CONFIG['orbit']
+
   field :title, localize: true
   field :footer, localize: true
   field :sub_menu, localize: true
-  field :backup_keep_for_days,:type=>Integer,:default=> APP_CONFIG['backup_keep_for_days']
 
   field :mobile_on, :type => Boolean, :default => false
   

app/models/tag.rb

@@ -8,7 +8,7 @@ class Tag
   include Mongoid::Timestamps
   include Impressionist::Impressionable
   
-  is_impressionable #:counter_cache => { :column_name => :view_count }
+  is_impressionable :counter_cache => { :column_name => :view_count }
   
   field :name, localize: true
   field :view_count, :type => Integer, :default => 0
@@ -17,6 +17,30 @@ class Tag
   belongs_to :module_tag, polymorphic: true
   has_many :taggings, dependent: :destroy
 
+  #field :cloud_amper,:type: Integer,:default=> 0 
+
+  # def self.sorted_for_cloud
+  #   tags = {}
+  #   self.all.each{ |tag|
+  #     tags.merge!({tag => self.get_impressionist(tag)})
+  #   }
+  #   if !tags.blank?
+  #     sorted_tags = tags.sort{|a,b| a[1]<=>b[1]}.reverse
+  #     sorted_tags[0][1] = :hot1
+  #     offset = (sorted_tags.size - 1) / 3
+  #     i = 1
+  #     class_i = 2
+  #     sorted_tags[1..-1].collect!{ |x|
+  #       x[1] = "hot#{class_i}"
+  #       i == offset ? i = 1 : i += 1 if class_i < 4
+  #       class_i += 1 if i == offset && class_i < 4
+  #     }
+  #     sorted_tags
+  #   else
+  #     []
+  #   end
+  # end
+
   protected
   
   def self.get_impressionist(item_tag = self)

app/models/user/user.rb

@@ -3,7 +3,7 @@ class User
   include Mongoid::Document
   include Mongoid::Timestamps
 
-  devise :database_authenticatable, :recoverable, :rememberable, :trackable, :validatable #, :timeoutable
+  devise :database_authenticatable, :recoverable, :rememberable, :trackable, :registerable, :validatable #, :timeoutable
   
   mount_uploader :avatar, AvatarUploader
   
@@ -42,6 +42,7 @@ class User
 
   before_create :initialize_desktop
   before_save :rebuild_status_record
+  before_save :save_roles
   scope :remote_account, where(:nccu_id.ne => nil)
   scope :not_guest_user, all_of(:name.ne => "guest")
 
@@ -88,9 +89,9 @@ class User
     var[:id].each do |id,val|  
       # binding.pry if id == '5052c5b22b5c49ab02000004'
       if (val=="true")
-        self.role_ids.reject!{|t| t.to_s == id}
+        self.roles = self.roles.reject{|t| t.id.to_s==id}
       elsif(val=="false")
-        self.role_ids += Array(id)
+        self.roles << Role.find(id)
       end
     end
   end
@@ -105,9 +106,9 @@ class User
       # binding.pry if id == '5052c5b22b5c49ab02000004'
 	  
       if ( self.roles.include?(@roid) == false or val=="true")
-        self.sub_role_ids.reject!{|t| t.to_s == id}
+        self.sub_roles = self.sub_roles.reject{|t| t.id.to_s==id}
       elsif(val=="false")
-        self.sub_role_ids += Array(id)
+        self.sub_roles << SubRole.find(id)
       end
 	  
     end
@@ -272,6 +273,10 @@ class User
   end
   
   protected
+    def save_roles
+      # self.roles = self.sub_roles.collect{|t| t.role}.uniq
+      self.roles = self.roles.uniq
+    end
 
   def rebuild_status_record
     self.status_record = {}

app/views/admin/designs/index.html.erb

@@ -8,5 +8,6 @@
 </table>
 
 <div class="form-actions form-fixed pagination-right">
+	<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t(:add), new_admin_design_path, :class => 'btn btn-primary pull-right' %>
     <%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t(:upload), upload_package_admin_designs_path, :class => 'btn btn-primary pull-right' %>
 </div>

app/views/default_widget/_typeA.html.erb

@@ -1,22 +1,19 @@
-<%= content_tag :div, class: @tag_class do %>
+<%= content_tag :div,:class=>@tag_class do%>
   <div class="default_widget_type_A">
     <table class="default_widget_tb" border="0" cellpadding="0" cellspacing="0" >
-      <thead>
+    <thead>
+      <tr>
+        <% @frontend_field_names.each_with_index do |field,index|%>
+          <%= content_tag(:th,content_tag(:span,get_field_header(field),:class=>@frontend_classes[index]))unless field.blank?%>
+        <% end %>
+      </tr>
+    </thead>
+      <% @data.each do |row_data| %>
         <tr>
-          <% @frontend_field_names.each_with_index do |field, index| %>
-            <%= content_tag(:th, content_tag(:span, get_field_header(field), class: @frontend_classes[index])) unless field.blank? %>
+          <% @frontend_field_names.each_with_index do |field,index|%>
+              <%= content_tag(:td,content_tag(:span,link_to_field(row_data,field, @frontend_sat_to_links[index], {orig_page: @page_id.to_s}),:class=>@frontend_classes[index]))unless field.blank?%>
           <% end %>
         </tr>
-      </thead>
-      <tbody>
-        <% @data.each do |row_data| %>
-          <tr class="<%= get_top_hot_class(row_data) %>">
-            <% @frontend_field_names.each_with_index do |field, index|%>
-              <%= content_tag(:td, content_tag(:span, link_to_field(row_data, field, @frontend_sat_to_links[index], {orig_page: @page_id.to_s, category_id: get_row_category(row_data), tag_id: get_row_tags(row_data)}), class: @frontend_classes[index])) unless field.blank? %>
-            <% end %>
-          </tr>
-        <% end %>
-      </tbody>
+      <% end %>
     </table>
-  </div>
-<% end %>
+  <% end %>

app/views/default_widget/_typeB.html.erb

@@ -1,13 +1,13 @@
-<%= content_tag :div, class: @tag_class do %>
+<%= content_tag :div,:class=>@tag_class do%>
   <ul class="default_widget_list">
     <% @data.each do |row_data| %>
-      <%= content_tag(:li, class: get_top_hot_class(row_data)) do %>
+      <%= content_tag(:li) do %>
         <div class="img app-pic">
-          <%= image_tag row_data.send(@widget_image_field) %>
+          <%= image_tag row_data.send(@widget_image_field)%>
         </div>
         <div class="wrap">
-          <% @frontend_field_names.each_with_index do |field, index| %>
-            <%= content_tag(:span, link_to_field(row_data,field, @frontend_sat_to_links[index], {orig_page: @page_id.to_s, category_id: get_row_category(row_data), tag_id: get_row_tags(row_data)}), class: @frontend_classes[index]) unless field.blank? %>
+          <% @frontend_field_names.each_with_index do |field,index|%>
+              <%= content_tag(:span,link_to_field(row_data,field, @frontend_sat_to_links[index], {orig_page: @page_id.to_s}),:class=>@frontend_classes[index]) unless field.blank?%>
           <% end %>
         </div>
       <% end %>

app/views/default_widget/_typeC.html.erb

@@ -1,12 +1,12 @@
-<%= content_tag :div, class: @tag_class do %>
+<%= content_tag :div,:class=>@tag_class do%>
   <div class="img app-pic">
-    <%= image_tag @data.first.send(@widget_image_field) %>
+    <%= image_tag @data.first.send(@widget_image_field)%>
   </div>
   <ul class="default_widget_list">
     <% @data.each do |row_data| %>
-      <%= content_tag(:li, class: get_top_hot_class(row_data)) do %>
-        <% @frontend_field_names.each_with_index do |field, index|%>
-            <%= content_tag(:span, link_to_field(row_data, field, @frontend_sat_to_links[index], {orig_page: @page_id.to_s, category_id: get_row_category(row_data), tag_id: get_row_tags(row_data)}), class: @frontend_classes[index]) unless field.blank? %>
+      <%= content_tag(:li) do %>
+        <% @frontend_field_names.each_with_index do |field,index|%>
+            <%= content_tag(:span, link_to_field(row_data,field, @frontend_sat_to_links[index], {orig_page: @page_id.to_s}),:class=>@frontend_classes[index]) unless field.blank?%>
         <% end %>
       <% end %>
     <% end %>

config/config.yml

@@ -3,7 +3,6 @@ defaults: &defaults
   store_ip: 'redmine.rulingcom.com:3001'
   orbit: 'Orbit'
   ruling_digital: 'RulingDigital'
-  backup_keep_for_days: 30
   
 development:
   <<: *defaults

config/initializers/resque.rb

@@ -3,7 +3,7 @@ require 'resque_scheduler/server'
 # require 'yaml'
 
 Resque.redis = 'localhost:6379'
-Resque.redis.namespace = Site.first.resque_namespace rescue APP_CONFIG['orbit']
+Resque.redis.namespace = "resque"
 
 # If you want to be able to dynamically change the schedule,
 # uncomment this line.  A dynamic schedule can be updated via the

config/mongoid.yml

@@ -8,7 +8,7 @@ defaults: &defaults
 
 development:
   <<: *defaults
-  database: test_site
+  database: demo_site_development
 test:
   <<: *defaults
   database: test_site
@@ -21,4 +21,4 @@ production:
   # password: <%= ENV['MONGOID_PASSWORD'] %>
   # database: <%= ENV['MONGOID_DATABASE'] %>
   <<: *defaults
-  database: test_site
+  database: demo_site_production

config/resque.god

@@ -4,32 +4,33 @@ user_home = ENV['HOME'] || File.dirname(__FILE__) + '/../..'
 development_uid = ''
 development_gid = ''
 
-num_workers = rails_env == 'production' ? <%= @resque_workers %> : 1
+num_workers = rails_env == 'production' ? 5 : 2
 
 num_workers.times do |num|
   God.watch do |w|
 
     w.dir        = rails_root
-    w.name    = "<%= @resque_namespace.nil? ? "" : "#{@resque_namespace}-" %>resque-worker-#{num}"
-    w.group   = 'rulingcom'
+    w.name    = "worker-#{num}"
+    w.group   = 'resque'
 
     w.interval = 30.seconds
 
     queue = case num
-        when 0..2
+        when 0
+                'critical'
+        when 1..2
                 'high,low'
         when 3..num_workers
                 'low'
     end
 
-    w.pid_file = "#{rails_root}/tmp/#{w.name}.pid"
-    w.env       = {"RAILS_ENV"=>rails_env,"PIDFILE" => w.pid_file ,"HOME"=>user_home, "QUEUE"=>queue, "RAILS_ENV"=>rails_env }
-    w.start     = "rake -f #{rails_root}/Rakefile resque:work"
-    w.stop = "sudo kill -KILL $(cat #{w.pid_file})"
+    w.env       = {"QUEUE"=>queue, "RAILS_ENV"=>rails_env}
+    w.start     = "HOME=#{user_home} QUEUE=* RAILS_ENV=#{rails_env} rake -f #{rails_root}/Rakefile resque:work"
+
     w.uid = (rails_env == 'production' )? "root" : development_uid
     w.gid = (rails_env == 'production' )? "root" : development_gid
   
-     w.log = (rails_env == 'production' )? "/var/log/#{w.group}/#{w.name}.log":"#{rails_root}/log/dev-#{w.name}.log"
+     w.log = (rails_env == 'production' )? "/var/log/#{w.group}/#{w.name}.log":"#{rails_root}/log/dev_resque-#{w.name}.log"
 
     # restart if memory gets too high
     w.transition(:up, :restart) do |on|

config/resque_schedule.god

@@ -6,19 +6,16 @@ development_gid = ''
 
   God.watch do |w|
     w.dir        = rails_root
-    w.name    = "<%= @resque_namespace.nil? ? "" : "#{@resque_namespace}-" %>sunspot-solr"
-    w.group   = 'rulingcom'
-    w.pid_file = "#{rails_root}/solr/pids/production/sunspot-solr-production.pid"
+    w.name    = "scheduler"
+    w.group   = 'resque'
     w.interval = 30.seconds
-    w.env       = {"RAILS_ENV"=>rails_env,"HOME"=>user_home ,"RAILS_ENV"=>rails_env}
-    w.start     = "rake -f #{rails_root}/Rakefile sunspot:solr:start"
-    w.stop = "sudo kill -KILL $(cat #{w.pid_file})"
-    w.keepalive
+    w.env       = {"QUEUE"=>"critical,high,low", "RAILS_ENV"=>rails_env}
+    w.start     = "HOME= #{user_home} QUEUE=* RAILS_ENV=#{rails_env} rake -f #{rails_root}/Rakefile resque:scheduler"
 
     w.uid = (rails_env == 'production' )? "root" : development_uid
     w.gid = (rails_env == 'production' )? "root" : development_gid
-    
-    w.log = (rails_env == 'production' )? "/var/log/#{w.group}/#{w.name}.log":"#{rails_root}/log/dev-#{w.name}.log"
+  
+     w.log = (rails_env == 'production' )? "/var/log/#{w.group}/#{w.name}.log":"#{rails_root}/log/dev_resque-#{w.name}.log"
 
     # restart if memory gets too high
     w.transition(:up, :restart) do |on|

config/resque_schedule.yml

@@ -1,15 +1,3 @@
-dashboard_counter_cache:
-  cron: 0 * * * * *
-  class: DashboardCounter
-  args:
-  description: DashboardCounterCache
-
-backup_server:
-  cron: 0 0 2 * * *
-  class: BackupServer
-  args:
-  description: BackupServer and remove old backups
-
 update_tag_cloud:
   cron: 0 0 [0,12] * * *
   class: UpdateTagCloud
@@ -26,4 +14,4 @@ email_cron:
   cron: 0 0 [10,16,22] * * *
   class: EmailCron
   args:
-  description: EmailCron
+  description: EmailCron

lib/delay_impressionist_request.rb

@@ -1,18 +0,0 @@
-class DelayImpressionistRequest
-  attr_accessor :session_options,:remote_ip,:referer,:user_agent
-  def initialize(request=nil)
-    if request
-      self.session_options=request.session_options
-      self.remote_ip=request.remote_ip
-      self.referer=request.referer
-      self.user_agent=request.user_agent
-    end
-  end
-
-  def restore(args)
-    args.each do |key,value|  
-      self.send("#{key}=", value)
-    end
-  end
-
-end

lib/orbit_app/helper/default_widget_tag_helper.rb

@@ -6,14 +6,15 @@ module DefaultWidgetTagHelper
     @request = req
     params.delete :inner
     @params = params
-    params_str = "?"
+
+    params_str ="?"
     params.each do |index,param|  
       if param.is_a?(Array) and !param.blank?
-        params_str << "&" unless params_str.eql?("?")
         params_str << param.collect{|t| "#{index}[]=#{t}"}.join("&")
         params.delete index
       end
-    end
+    end  
+    
     params_str = params_str + (params_str.eql?("?") ? params.to_param : "&#{params.to_param}" )
       content_tag :div,:class=> 'more' do 
   	 link_to I18n.t(@more_link[:label_i18n]),[eval("#{@more_link[:path_method]}"),params_str].join()

lib/orbit_app/module/visitor_counter.rb

@@ -1,28 +0,0 @@
-module OrbitApp
-    module Module
-      module VisitorCounter
-        Version = "0.1"
-
-        def display_visitors(options={})
-          Site.first.visitor_counters["total"]
-        end
-
-        def display_visitors_today
-          Site.first.visitor_counters["today"]
-        end
-
-        def display_visitors_this_week
-          Site.first.visitor_counters["this_week"]
-        end
-
-        def display_visitors_this_month
-          Site.first.visitor_counters["this_month"]
-        end
-
-        def display_visitors_this_year
-          Site.first.visitor_counters["this_year"]
-        end
-
-    end # of VisitorCounter
-  end # of Module
-end # of OrbitApp

lib/orbit_app/module/visitor_counter_eval.rb

@@ -1,36 +0,0 @@
-module OrbitApp
-    module Module
-      module VisitorCounterEval
-        Version = "0.1"
-
-        def display_visitors(options={})
-            map = "function(){ emit( this.referrer,{session_hash: this.session_hash,created_at: this.created_at}); };"
-            reduce = "function(key, values){ var sum = 0; values.forEach(function(doc){sum += doc.amount; }); return {amount: sum};};"
-            if options.blank?
-              impressions = Impression.collection.map_reduce(map, reduce,read: :primary, out: "vr")
-            else
-              query = Impression.where(options).selector
-              impressions = Impression.where(options).collection.map_reduce(map, reduce,read: :primary, out: "vr",:query=>query)
-            end
-          impressions.count            
-        end
-
-        def display_visitors_today
-          display_visitors(created_at: {'$gte' => Date.today.beginning_of_day , '$lte' => DateTime.now})
-        end
-
-        def display_visitors_this_week
-          display_visitors(created_at: {'$gte' => Date.today.beginning_of_day - 7.days, '$lte' => DateTime.now})
-        end
-
-        def display_visitors_this_month
-          display_visitors(created_at: {'$gte' => Date.today.beginning_of_day - 1.month, '$lte' => DateTime.now})
-        end
-
-        def display_visitors_this_year
-          display_visitors(created_at: {'$gte' => Date.today.beginning_of_day - 1.year, '$lte' =>DateTime.now})
-        end
-      end # end of VisitorCounterEval
-  end # of Module
-end # of OrbitApp
-

lib/orbit_app/module/widget.rb

@@ -102,17 +102,12 @@ module OrbitApp
           def  initialize(&block)
             @query = nil
             @image = nil
-	      @sorting_query = 'desc(:created_at)'
             @more_link = {}
             @fields = []
             @enabled_styles = STYLE
              block.arity < 1 ? instance_eval(&block) : block.call(self) if block_given?
           end
 
-	  def sorting(query)
-	    @sorting_query = query
-	  end
-
           def enable(args)
             @enabled_styles = args
           end
@@ -127,7 +122,7 @@ module OrbitApp
           end
 
           def to_module_app_format
-            {"query"=>@query,"image"=>@image,"more_link"=>@more_link,"enabled_styles"=>@enabled_styles,:sorting_query=>@sorting_query} rescue nil
+            {"query"=>@query,"image"=>@image,"more_link"=>@more_link,"enabled_styles"=>@enabled_styles} rescue nil
           end
 
           def link_field(field_name,setting)

lib/orbit_tag/taggable.rb

@@ -43,7 +43,6 @@ module OrbitTag
           def tags=(tag_ids)
             ids = [tag_ids].flatten
             tag_ids.delete('')
-            self.tagged_ids = tag_ids
             ids = self.taggings.blank? ? [] : self.taggings.map{|t| t.tag.id}
             tag_ids.each do |tag_id|
               unless ids.include? tag_id
@@ -59,6 +58,9 @@ module OrbitTag
 
           def tag_ids=(ids)
             self.tags = ids
+            ids = [ids].flatten
+            ids.delete('')
+            self.tagged_ids = ids
           end
 
           private

lib/tasks/migrate.rake

@@ -310,60 +310,4 @@ namespace :migrate do
     Rake::Task["web_link_url:web_link_url_i18n"].execute
   end
 
-  task :fix_tagged_ids => :environment do
-    Tag.all.each do |tag|
-      tag.taggings.each do |tagging|
-        tagged_ids = tagging.taggable.tagged_ids
-        unless tagged_ids.include?(tag.id.to_s)
-          tagged_ids << tag.id.to_s
-          tagging.taggable.update_attribute(:tagged_ids, tagged_ids)
-        end
-      end
-    end
-  end
-
-  task :clear_news_tags => :environment do
-    `mongo #{Mongoid.config.database.name} --eval "db.tags.remove({_type: {$ne: 'Tag'}})"`
-  end
-
-  task :add_missing_user_link => :environment do
-    User.all.each do |user|
-      user.role_ids.uniq!
-      user.sub_role_ids.uniq!
-      user.save
-      user.roles.each do |role|
-        unless role.user_ids.include?(user.id)
-          role.user_ids << user.id
-          role.save
-        end
-      end
-      user.sub_roles.each do |sub_role|
-        unless sub_role.user_ids.include?(user.id)
-          sub_role.user_ids << user.id
-          sub_role.save
-        end
-      end
-    end
-    Role.all.each do |role|
-      role.user_ids.uniq!
-      role.save
-      role.users.each do |user|
-        unless user.role_ids.include?(role.id)
-          user.role_ids << role.id
-          user.save
-        end
-      end
-    end
-    SubRole.all.each do |sub_role|
-      sub_role.user_ids.uniq!
-      sub_role.save
-      sub_role.users.each do |user|
-        unless user.sub_role_ids.include?(sub_role.id)
-          user.sub_role_ids << sub_role.id
-          user.save
-        end
-      end
-    end
-  end
-
 end

lib/tasks/site.rake

@@ -1,5 +1,4 @@
 # encoding: utf-8 
-require 'erb'
 
 namespace :site do
   
@@ -10,26 +9,21 @@ namespace :site do
     Site.create( :school => 'RulingDigital University', :department => 'Computer Science', :valid_locales => [ 'en', 'zh_tw' ], :in_use_locales => [ 'zh_tw', 'en' ]) 
     User.create!(:email=>'chris@rulingcom.com',:admin=>true,:user_id=>'chris',:password=>'password')
     `mongo #{Mongoid.config.database.name} --eval "db.fs.chunks.ensureIndex({files_id: 1, n: 1})"`
-
     puts  "Congres you can now login within url"
     puts 'Please upload design package (/admin/designs/upload_package ) and run rake site:necessary_data'
     I18nVariable.create!( :document_class => 'language', :key => 'en', :en => 'English', :zh_tw => '英文' )
     I18nVariable.create!( :document_class => 'language', :key => 'zh_tw', :en => 'Chinese', :zh_tw => '中文' )
-    Info.create!(key: "profile", built_in: true, disabled: false, title: {"zh_tw"=>"基本欄位", "en"=>"Basic Info"}, to_search: false)  
+    Info.create!(key: "profile", built_in: true, disabled: false, title: {"zh_tw"=>"基本欄位", "en"=>"Basic Info"}, to_search: false)
   end
   
-  task :create_logrotate => :environment do #Can remove after all products update
-    create_rulingcom_logrotate
-  end
-
   task :necessary_data => :environment do
-    auto_setting
     site = Site.first
-    site.update_attribute(:title,'RulingOrbit Demo Site')
-    site.update_attribute(:resque_namespace,@resque_namespace)
+    site.title = 'RulingOrbit Demo Site'
+    site.save
 
     # home_trans = I18nVariable.create!( :document_class => 'Home', :key => 'home', :en => 'Homepage', :zh_tw => '首頁')
     design = Design.first
+    site = Site.first
     site.design = design
     site.save
     theme = design.themes.first
@@ -37,78 +31,6 @@ namespace :site do
 
     home.title_translations = {"zh_tw"=>"首頁", "en"=>"Home"}
     home.save 
-
-    puts "Rember to restart server after you setup all sites for starting God"
   end
 
-  task :start_auto_setting => :environment do
-    auto_setting
-  end
-
-  def auto_setting
-    puts "Enter your resque namespace[Orbit]:......"
-    @resque_namespace = STDIN.gets.gsub("\n",'')
-    @resque_namespace = APP_CONFIG['orbit'] if @resque_namespace.empty?
-
-
-    puts "Is this the only site [ Entry site? ] on this mechine?[Default No]:......"
-    site_is_alone = false
-    site_is_alone = STDIN.gets.gsub("\n",'')
-    site_is_alone = true if site_is_alone.downcase == 'yes'
-
-    puts "Is this a primary site?[Default No]:......"
-    site_is_primary = false
-    site_is_primary = STDIN.gets.gsub("\n",'')
-    site_is_primary = true if site_is_primary.downcase == 'yes'
-
-    puts "Traffic heavy?[Default No]:......"
-    traffic_heavy = false
-    traffic_heavy = STDIN.gets.gsub("\n",'')
-    traffic_heavy = true if traffic_heavy.downcase == 'yes'
-
-    @traffic_rate = traffic_heavy ? 2 : 1
-
-    if site_is_alone
-        @resque_workers = 5 * @traffic_rate  #Entry Site 
-    else
-        if site_is_primary
-            @resque_workers = 2  * @traffic_rate  #Primary Site 
-        else
-            @resque_workers = 1  * @traffic_rate  #Secondary Site 
-        end
-    end
-    
-    resque_setting = ERB.new(File.new("lib/template/setting/resque.god.erb").read)
-    File.open("config/resque.god", 'w') { |file| file.write(resque_setting.result) }
-
-    resque_schedule_setting = ERB.new(File.new("lib/template/setting/resque_schedule.god.erb").read)
-    File.open("config/resque_schedule.god", 'w') { |file| file.write(resque_schedule_setting.result) }
-
-    if site_is_primary
-        solr_setting = ERB.new(File.new("lib/template/setting/solr.god.erb").read)
-        File.open("config/solr.god", 'w') { |file| file.write(solr_setting.result) }        
-        create_rulingcom_logrotate
-    end  
-  end
-
-
-def create_rulingcom_logrotate
-    `sudo mkdir -p /var/log/rulingcom` unless File.directory? "/var/log/rulingcom"
-    @project_folder = ENV["PWD"]
-    puts "Is your Orbit folder: #{@project_folder} (If YES => Press enter,or enter your path)"
-    user_enter_project_folder = STDIN.gets.gsub("\n",'')
-    @project_folder = user_enter_project_folder unless user_enter_project_folder.empty?
-
-    @user_home_folder = ENV["HOME"]
-    puts "Is your Home folder: #{@user_home_folder} (If YES => Press enter,or enter your path)"
-    user_enter_home_folder = STDIN.gets.gsub("\n",'')
-    @user_home_folder = user_enter_home_folder unless user_enter_home_folder.empty?
-
-    logrotate_setting = ERB.new(File.new("lib/template/setting/rulingcom_log.erb").read)
-    File.open("#{@project_loc}/tmp/logrotate_setting", 'w') { |file| file.write(logrotate_setting.result) } 
-
-    `sudo cp #{@project_loc}/tmp/logrotate_setting /etc/logrotate.d/rulingcom` 
-    `logrotate -v -f /etc/logrotate.conf`
-end
-
 end

lib/tasks/system_check.rake

@@ -1,14 +0,0 @@
-# encoding: utf-8 
-namespace :system_check do
-  task :god_can_start => :environment do
-     unless File.directory? "/var/log/rulingcom"
-       puts "Creating Rulingcom log folder"
-       `sudo mkdir -p /var/log/rulingcom`
-     end
-  end
-  task :set_resque_namespace,[:namespace] => :environment do |t,args|
-    site = Site.first
-    site.resque_namespace = args[:namespace]
-    site.save
-  end
-end

lib/template/setting/resque_schedule.god.erb

@@ -1,59 +0,0 @@
-rails_env   = ENV['RAILS_ENV']  || "production"
-rails_root  = ENV['RAILS_ROOT'] || File.dirname(__FILE__) + '/..'
-user_home = ENV['HOME'] || File.dirname(__FILE__) + '/../..'
-development_uid = ''
-development_gid = ''
-
-  God.watch do |w|
-    w.dir        = rails_root
-    w.name    = "<%= @resque_namespace.nil? ? "" : "#{@resque_namespace}-" %>resque-scheduler"
-    w.group   = 'rulingcom'
-    w.interval = 10.seconds
-    w.pid_file = "#{rails_root}/tmp/#{w.name}.pid"
-
-    w.env       = {"QUEUE"=>"*", "RAILS_ENV"=>rails_env,"HOME"=>user_home, "RAILS_ENV"=>rails_env}
-    w.start     = "rake -f #{rails_root}/Rakefile resque:scheduler"
-    w.stop = "sudo kill -KILL $(cat #{w.pid_file})"
-    w.uid = (rails_env == 'production' )? "root" : development_uid
-    w.gid = (rails_env == 'production' )? "root" : development_gid
-  
-    w.log = (rails_env == 'production' )? "/var/log/#{w.group}/#{w.name}.log":"#{rails_root}/log/dev-#{w.name}.log"
-
-    # restart if memory gets too high
-    w.transition(:up, :restart) do |on|
-      on.condition(:memory_usage) do |c|
-        c.above = 350.megabytes
-        c.times = 2
-      end
-    end
-
-    # determine the state on startup
-    w.transition(:init, { true => :up, false => :start }) do |on|
-      on.condition(:process_running) do |c|
-        c.running = true
-      end
-    end
-
-    # determine when process has finished starting
-    w.transition([:start, :restart], :up) do |on|
-      on.condition(:process_running) do |c|
-        c.running = true
-        c.interval = 5.seconds
-      end
-
-      # failsafe
-      on.condition(:tries) do |c|
-        c.times = 5
-        c.transition = :start
-        c.interval = 5.seconds
-      end
-    end
-
-    # start if process is not running
-    w.transition(:up, :start) do |on|
-      on.condition(:process_running) do |c|
-        c.running = false
-      end
-    end
-  end
-

lib/template/setting/rulingcom_log.erb

@@ -1,33 +0,0 @@
-/var/log/rulingcom/*.log  {
-    daily
-    dateext
-    compress
-    rotate 30
-}
-
-#Resque
-<%= "#{@project_folder}/nginx/logs/access.log" %>{
-    daily
-    dateext
-    compress
-    rotate 30
-}
-
-#DB log
-/var/log/mongodb{
-    daily
-    dateext
-    compress
-    rotate 30
-}
-
-#Orbit
-<%= "#{@project_folder}/log/*production.log" %>{
-    daily
-    dateext
-    compress
-    rotate 30
-}
-# end of Orbit,EXTEND IF NEEDED
-
-#Remember to save this file as /etc/logrotate.d/rulingcom

vendor/built_in_modules/announcement/app/assets/stylesheets/announcement/bulletins_and_web_links.css

@@ -1,78 +0,0 @@
-
-.mega_tab_block {
-    clear: both;
-    position: relative;
-}
-
-.mega_tab_block h3 {
-    font: 22px/100% 'arial',sans-serif;
-    margin: 0 0 10px;
-    padding: 0;
-}
-
-.mega_tab_block .pagination {
-    float: left;
-    height: auto;
-    margin: 10px 0 0;
-    width: auto;
-}
-.mega_tab_block .pagination a {
-    background: none repeat scroll 0 0 #EEEEEE;
-    display: block;
-    float: left;
-    margin: 0 5px 0 0;
-    padding: 10px;
-}
-
-
-.tag_block {
-    clear: both;
-    margin: 0 0 20px;
-    position: relative;
-}
-.mega_tab_block .tag_list {
-    background: none repeat scroll 0 0 #EEEEEE;
-    margin: 0;
-    overflow: hidden;
-    padding: 0 0 0 5px;
-}
-.mega_tab_block .tag_list li {
-    float: left;
-    list-style: none outside none;
-}
-.mega_tab_block .tag_list li a {
-    background: none repeat scroll 0 0 #DDDDDD;
-    float: left;
-    margin: 0 5px 0 0;
-    padding: 10px;
-}
-
-.news_block {
-    clear: both;
-    margin: 0 0 20px;
-    overflow: hidden;
-    position: relative;
-}
-.mega_tab_block .news_list {
-    margin: 0;
-    padding: 0;
-}
-.mega_tab_block .news_list li {
-    list-style: none outside none;
-    padding: 5px 0;
-}
-
-
-.links_block {
-    clear: both;
-    overflow: hidden;
-    position: relative;
-}
-.mega_tab_block .links_list {
-    margin: 0;
-    padding: 0;
-}
-.mega_tab_block .links_list li {
-    list-style: none outside none;
-    padding: 5px 0;
-}

vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/approvals_controller.rb

@@ -7,7 +7,6 @@ class Panel::Announcement::BackEnd::ApprovalsController  < OrbitBackendControlle
 
   
   def preview_and_approve
-    email_group_data
     @bulletin = Bulletin.find params[:bulletin_id]
   end
   
@@ -113,8 +112,7 @@ class Panel::Announcement::BackEnd::ApprovalsController  < OrbitBackendControlle
         :mail_subject => "#{t("announcement.mail_subject",:site_title => @site.title)}：#{bulletin.title}",
         :mail_to => @group_mail.join(','),
         :mail_content => @mail_content ,
-        # :mail_sentdate => bulletin.email_sentdate,
-        :mail_sentdate => DateTime.now,
+        :mail_sentdate => bulletin.email_sentdate,
         :create_user_id => bulletin.create_user_id,
         :update_user_id => bulletin.create_user_id
       } 
@@ -123,8 +121,6 @@ class Panel::Announcement::BackEnd::ApprovalsController  < OrbitBackendControlle
 
       @mail_cron.save
 
-      MailCron.send_mail_now(@mail_cron.id)
-
     end
     
   end

vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb

@@ -9,12 +9,12 @@ class Panel::Announcement::BackEnd::BulletinCategorysController < OrbitBackendCo
 #     @module_app = ModuleApp.where(:title=>'Announcement').first
 #   end
 # =======
-  before_filter :for_app_manager,:except => [:index,:get_categorys_json,:get_bulletins_json, :get_bulletin_categories]
+  before_filter :for_app_manager,:except => [:index,:get_categorys_json,:get_bulletins_json]
 
 
   before_filter :force_order_for_visitor,:only=>[:index,:get_categorys_json,:get_bulletins_json]
-  before_filter :force_order_for_user,:except => [:index,:get_categorys_json,:get_bulletins_json, :get_bulletin_categories]
-  before_filter :for_app_sub_manager,:except => [:index,:get_categorys_json,:get_bulletins_json, :get_bulletin_categories]
+  before_filter :force_order_for_user,:except => [:index,:get_categorys_json,:get_bulletins_json]
+  before_filter :for_app_sub_manager,:except => [:index,:get_categorys_json,:get_bulletins_json]
 
   def index
     @bulletin_categorys = get_categories_for_index("BulletinCategory")
@@ -53,24 +53,6 @@ class Panel::Announcement::BackEnd::BulletinCategorysController < OrbitBackendCo
     render :json => JSON.pretty_generate(data)
   end
 
-  def get_bulletin_categories
-    I18n.locale = params[:locale] || :zh_tw
-    @categories = BulletinCategory.all.order_by(:title, :asc)
-    respond_to do |format|
-      format.json {
-        custom_categories = @categories.inject([]) do |data, category|
-          data << {
-            title: category.title,
-            link: "#{request.protocol}#{request.host_with_port}#{panel_announcement_front_end_bulletins_path(bulletin_category_id: category.id, locale: I18n.locale)}",
-            link_json: "#{request.protocol}#{request.host_with_port}#{get_bulletins_panel_announcement_back_end_bulletins_path(category_id: category.id, locale: I18n.locale)}"
-          }
-        end
-        render json: JSON.pretty_generate(custom_categories)
-      }
-      format.rss {}
-    end
-  end
-
   def get_bulletins_json
     bulletin = BulletinCategory.find(params[:bulletin_category_id]).bulletins
     p bulletin

vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb

@@ -7,8 +7,8 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
   #  before_filter :for_admin_only,:only => [:]
   #  before_filter :for_app_manager,:only => [:index,:show,] 
   before_filter :force_order_for_visitor,:only=>[:index,:show,:get_sorted_and_filtered_bulletins]
-  before_filter :force_order_for_user,:except => [:index,:show,:get_sorted_and_filtered_bulletins, :get_bulletins]
-  before_filter :for_app_sub_manager,:except => [:index,:show,:get_sorted_and_filtered_bulletins, :get_bulletins]
+  before_filter :force_order_for_user,:except => [:index,:show,:get_sorted_and_filtered_bulletins]
+  before_filter :for_app_sub_manager,:except => [:index,:show,:get_sorted_and_filtered_bulletins]
 
   before_filter :only => [ :new,:create,:edit,:update,:create] do |controller|
     controller.get_categorys('BulletinCategory')
@@ -153,12 +153,12 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
       respond_to do |format|
         if @bulletin.save
 
-          # if @bulletin.email_sent == true && @bulletin.is_checked == true && !@bulletin.is_rejected
-          #   send_email_data(@bulletin)
+          if @bulletin.email_sent == true && @bulletin.is_checked == true && !@bulletin.is_rejected
+            send_email_data(@bulletin)
 
-          #   @bulletin.email_sent = false
-          #   @bulletin.save
-          # end
+            @bulletin.email_sent = false
+            @bulletin.save
+          end
 
           format.html { redirect_to(panel_announcement_back_end_bulletins_url, :notice => t('announcement.create_bulletin_success')) }
           format.xml  { render :xml => @bulletin, :status => :created, :location => @bulletin }
@@ -241,12 +241,12 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
             @bulletin.de_pending!
           end
 
-          # if @bulletin.email_sent == true && @bulletin.is_checked == true && !@bulletin.is_rejected
-          #   send_email_data(@bulletin)
+          if @bulletin.email_sent == true && @bulletin.is_checked == true && !@bulletin.is_rejected
+            send_email_data(@bulletin)
 
-          #   @bulletin.email_sent = false
-          #   @bulletin.save
-          # end
+            @bulletin.email_sent = false
+            @bulletin.save
+          end
 
           # if (params[:bulletin][:is_checked] == "false")
           #   @bulletin.is_rejected = true
@@ -312,48 +312,6 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
     redirect_to panel_announcement_back_end_bulletins_url(:filter => params[:filter], :direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options])
   end
 
-  # ================================================================
-  # language:
-  #   - default: zh_tw
-  #   - specify language: locale=[string]
-  # category:
-  #   - default: no category
-  #   - specify: category_id=[ID]
-  # pagination:
-  #   - default: 10
-  #   - specify the number of results: per=[number]
-  #   - specify the page: page=[number]
-  # ================================================================
-  def get_bulletins
-    I18n.locale = params[:locale] || :zh_tw
-    bulletins = params[:category_id] ? Bulletin.where(bulletin_category_id: params[:category_id]).order_by(:created_at, :desc) : Bulletin.all.order_by(:created_at, :desc)
-    bulletins = bulletins.reject{|b| b.title_translations[I18n.locale.to_s].blank?}
-    @bulletins = Kaminari.paginate_array(bulletins).page(params[:page]).per(params[:per] || 10)
-
-    respond_to do |format|
-      format.json { 
-        custom_bulletins = @bulletins.inject([]) do |data, bulletin|
-          deadline = bulletin.deadline.nil? ? t(:no_deadline) : display_date_time(bulletin.deadline)
-          image_url = "#{'/' unless bulletin.image.url.start_with?('/')}#{bulletin.image.url}"
-          data << {
-            title: bulletin.title,
-            link: "#{request.protocol}#{request.host_with_port}#{panel_announcement_front_end_bulletin_path(bulletin, category_id: bulletin.bulletin_category.id, locale: I18n.locale)}",
-            image: "#{request.protocol}#{request.host_with_port}#{image_url}",
-            category: bulletin.bulletin_category.title,
-            content: bulletin.text,
-            postdate: display_date_time(bulletin.postdate),
-            deadline: deadline,
-            tag: bulletin.sorted_tags.map{|tag| tag.name}
-          }
-        end
-        render json: JSON.pretty_generate(custom_bulletins)
-      }
-      format.rss  { 
-        @category = BulletinCategory.find(params[:category_id]) rescue nil
-      }
-    end
-  end
-
 
   protected
 
@@ -398,8 +356,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
         :mail_subject => "#{t("announcement.mail_subject",:site_title => @site.title)}：#{bulletin.title}",
         :mail_to => @group_mail.join(','),
         :mail_content => @mail_content ,
-        # :mail_sentdate => bulletin.email_sentdate,
-        :mail_sentdate => DateTime.now,
+        :mail_sentdate => bulletin.email_sentdate,
         :create_user_id => bulletin.create_user_id,
         :update_user_id => bulletin.create_user_id
       } 
@@ -408,8 +365,6 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
 
       @mail_cron.save
 
-      MailCron.send_mail_now(@mail_cron.id)
-
     end
     
   end

vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb

@@ -26,7 +26,6 @@ class Panel::Announcement::FrontEnd::BulletinsController < OrbitWidgetController
   end
 
   def index
-
     @item = Page.find(params[:page_id]) rescue nil
     if @item
       if @item.frontend_data_count
@@ -61,11 +60,7 @@ class Panel::Announcement::FrontEnd::BulletinsController < OrbitWidgetController
       else
         @bulletins = Bulletin.all.available_for_lang(I18n.locale).can_display.any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate).page( params[:page_main]).per(@page_num)
       end
-      if params["tag_id"]
-        params["tag_id"].each do |tag_id|
-          delayed_impressionist(Tag.find tag_id) rescue nil
-        end
-      end
+      delayed_impressionist(@tag) if @tag
     end
 
   end

vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb

@@ -66,75 +66,14 @@ class Panel::Announcement::Widget::BulletinsController < OrbitWidgetController
     
   end
   
-  def bulletins_and_web_links
-  
-    @part = PagePart.find(params[:part_id]) if !params[:part_id].blank?
-    
-    @title = @part.title_translations[I18n.locale.to_s]
-    
-    if !@part.blank? and @part.widget_data_count
-      @page_num = @part.widget_data_count
-    else
-      @page_num = 5
-    end
-
-    date_now = Time.now
-
-    if !params[:tag_id].blank?
-      @tags = Tag.any_in(:_id => params[:tag_id]).asc(:created_at)
-    elsif params[:tag_id].blank? and !@part.tag.blank?
-      @tags = Tag.any_in(:_id => @part.tag).asc(:created_at)
-    else
-      @ModuleApp_b = ModuleApp.first(:conditions => {:key=>'announcement'})
-      @tags = Tag.where(:module_tag_id => @ModuleApp_b.id).asc(:created_at)
-    end
-
-    @selected_tag = Tag.find(params[:id]).first rescue @tags[0]
-
-    @bulletins = Bulletin.available_for_lang(I18n.locale).can_display.where(:tagged_ids => @selected_tag.id.to_s, :is_hidden => false).any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc(:is_top, :postdate).page(params[:page]).per(@page_num) rescue nil
-
-    if @part.widget_style == 'bulletins_and_web_links'
-      @ModuleApp_w = ModuleApp.first(:conditions => {:key=>'web_resource'})
-      @link_selected_tag = Tag.first(:conditions => {:name => @selected_tag.name, :module_tag_id => @ModuleApp_w.id})
-      @web_links = WebLink.where(:tagged_ids => @link_selected_tag.id.to_s, :is_hidden => false).desc(:is_top,:created_at).available_for_lang(I18n.locale).page(params[:page]).per(@page_num) rescue nil
-    end
-    
-  end
-  
   def reload_bulletins
-  
-    @part = PagePart.find(params[:part_id]) if !params[:part_id].blank?
-    
-    @title = @part.title_translations[I18n.locale.to_s]
-    
-    if !@part.blank? and @part.widget_data_count
-      @page_num = @part.widget_data_count
-    else
-      @page_num = 5
-    end
-    
-    date_now = Time.now
-
-    @selected_tag = Tag.find(params[:tag_id]).first
-    @bulletins = Bulletin.available_for_lang(I18n.locale).can_display.where(:tagged_ids => @selected_tag.id.to_s, :is_hidden => false).any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc(:is_top, :postdate).page(params[:page]).per(@page_num) rescue nil
+    @selected_tag = Tag.find(params[:tag_id])
+    @bulletins = Bulletin.available_for_lang(I18n.locale).can_display.where(:tagged_ids => params[:tag_id]).where(:is_hidden => false).any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc(:is_top, sort).page(params[:page]).per(5) rescue nil
   end
   
   def reload_web_links
-  
-    @part = PagePart.find(params[:part_id]) if !params[:part_id].blank?
-    
-    if !@part.blank? and @part.widget_data_count
-      @page_num = @part.widget_data_count
-    else
-      @page_num = 5
-    end
-    
-    date_now = Time.now
-
-    @selected_tag = Tag.find(params[:tag_id]).first
-    @ModuleApp = ModuleApp.first(:conditions => {:key=>'web_resource'})
-    @link_selected_tag = Tag.first(:conditions => {:name => @selected_tag.name, :module_tag_id => @ModuleApp.id})
-    @web_links = WebLink.where(:tagged_ids => @link_selected_tag.id.to_s, :is_hidden => false).desc(:is_top,:created_at).available_for_lang(I18n.locale).page(params[:page]).per(@page_num) rescue nil
+    @selected_tag = Tag.find(params[:tag_id])
+    @web_links = WebLink.where(:name => @selected_tag.name).where(:is_hidden => false).desc(:is_top, sort).available_for_lang(I18n.locale).page(params[:page]).per(5) rescue nil
   end
 
   def bulletins_side_bar

vendor/built_in_modules/announcement/app/models/bulletin.rb

@@ -14,7 +14,7 @@ class Bulletin
   include OrbitTag::Taggable
   taggable
 
-  is_impressionable #:counter_cache => { :column_name => :view_count }
+  is_impressionable :counter_cache => { :column_name => :view_count }
 
   field :title, localize: true
   field :subtitle, localize: true
@@ -89,10 +89,6 @@ class Bulletin
   def bulletin_category_with_title
     self.bulletin_category.title
   end
-  
-  def bulletin_create_dept
-    User.get_member_list_attribute_value(self.create_user_id,"staff","Unit").get_value_by_locale(I18n.locale)
-  end
 
   def share_item
       Item.first(conditions:{name: 'announcement'})
@@ -225,32 +221,6 @@ class Bulletin
     preview_object
   end
 
-  def get_email_group_data(email_group_data)
-
-    group_mail = Array.new
-
-    self.email_group.each do |egroup|
-
-      if email_group_data.include?(egroup) and (egroup == '0' or egroup == '1' or egroup == '2' or egroup == '3')
-
-        group_mail << "#{email_group_data[egroup]["email"]}(#{email_group_data[egroup]["name"]})"
-
-      elsif email_group_data.include?(egroup) and egroup == '4'
-
-        self.other_mailaddress.split(",").each do |otmail|
-
-          group_mail <<  "#{otmail}(#{email_group_data[egroup]["name"]})" 
-
-        end
-
-      end
-
-    end
-
-    group_mail.join("<br />").html_safe
-
-  end
-
 
   protected
 

vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/approvals/_modal_approve.html.erb

@@ -14,12 +14,6 @@
 			<%# preview_block_ad_images_helper(bulletin).each do |ad_image| -%>
 				<%#= image_tag ad_image.file,:alt => (ad_image.title[locale] || " "),:time_to_next => bulletin.transition_msec,:link_open=> ad_image.link_open, :link_url =>((ad_image.out_link || bulletin.context || " ")) %>
 			<%# end -%>
-
-			<% if !@bulletin.email_group.blank? %>
-				<%= label_tag 'group_mail' %>
-				<%= @bulletin.get_email_group_data(@email_group_data) %>
-			<% end %>
-
     </p>
   </div>
   <div class="modal-footer">

vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/get_bulletin_categories.rss.builder

@@ -1,16 +0,0 @@
-xml.instruct! :xml, :version => "1.0" 
-xml.rss :version => "2.0" do
-  xml.channel do
-    xml.title t('announcement.announcement') + ' ' + t('announcement.categories')
-    xml.link "#{request.protocol}#{request.host_with_port}#{get_bulletin_categories_panel_announcement_back_end_bulletin_categorys_path(format: 'rss')}"
-
-    @categories.each do |category|
-      xml.item do
-        xml.title category.title
-        xml.pubDate category.created_at.to_s(:rfc822)
-        xml.link "#{request.protocol}#{request.host_with_port}#{get_bulletins_panel_announcement_back_end_bulletins_path(bulletin_category_id: category.id, locale: I18n.locale, format: 'rss')}"
-        xml.guid "#{request.protocol}#{request.host_with_port}#{panel_announcement_front_end_bulletins_path(bulletin_category_id: category.id)}"
-      end
-    end
-  end
-end

vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb

@@ -278,7 +278,7 @@
                     <div id="content-box">
                         <hr />
 
-												<%#= f.datetime_picker :email_sentdate, :picker_type => 'separated', :label => t("announcement.email_sentdate") %>
+												<%= f.datetime_picker :email_sentdate, :picker_type => 'separated', :label => t("announcement.email_sentdate") %>
 												
 												<br /> 
 

vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/get_bulletins.rss.builder

@@ -1,21 +0,0 @@
-xml.instruct! :xml, :version => "1.0" 
-xml.rss :version => "2.0" do
-  xml.channel do
-    if @category
-      xml.title @category.title
-    else
-      xml.title t('announcement.announcement')
-    end
-    xml.link "#{request.protocol}#{request.host_with_port}#{get_bulletins_panel_announcement_back_end_bulletins_path(bulletin_category_id: @category.try(:id))}.rss"
-
-    @bulletins.each do |bulletin|
-      xml.item do
-        xml.title bulletin.title
-        xml.pubDate bulletin.postdate.to_s(:rfc822)
-        xml.description bulletin.text
-        xml.link "#{request.protocol}#{request.host_with_port}#{panel_announcement_front_end_bulletin_path(bulletin, category_id: bulletin.bulletin_category.id, locale: I18n.locale)}"
-        xml.guid "#{request.protocol}#{request.host_with_port}#{panel_announcement_front_end_bulletin_path(bulletin)}"
-      end
-    end
-  end
-end

vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/show.html.erb

@@ -4,8 +4,8 @@
 	<div class="info1">
 		<span class="pull-right"><%= dislpay_view_count(@bulletin) %></span>
 		<span class="date"><%= display_date_time(@bulletin.postdate) %></span>
-		<% unit = User.get_member_list_attribute_value(@bulletin.create_user_id,"staff","Unit").get_value_by_locale(I18n.locale) rescue nil %>
-		<span><%= t('announcement.default_widget.bulletin_create_dept') + ": " + unit unless unit.blank? %></span>
+		<% unit =  @bulletin.cache_dept[I18n.locale.to_s] rescue nil %>
+		<span><%=  link_to unit,panel_announcement_front_end_index_bulletins_by_unit_path(:name=>unit) unless unit.blank? %></span>
 	</div>
 </div>
 <div class="news_image">

vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_bulletins.html.erb

@@ -1,10 +1,10 @@
 <% @bulletins.each do |bulletin| %>
 	<li>
-		<%= link_to bulletin.title, panel_announcement_front_end_bulletin_path(bulletin, :category_id => bulletin.bulletin_category_id , :part_id => params[:part_id], :tag_id => [@selected_tag.id] )  %>
+		<%= link_to bulletin.title, panel_announcement_front_end_bulletin_path(bulletin, :category_id => bulletin.bulletin_category_id , :tag_id => @selected_tag.id )  %>
 	</li>
 <% end %>
 
 <div class='pagination'>
-	<%= link_to_previous_page @bulletins, 'Previous Page', :params => {:controller => 'widget/bulletins', :action => 'reload_bulletins', :part_id => params[:part_id], :tag_id => [@selected_tag.id]}, :remote => true, :class => 'previous' %>
-	<%= link_to_next_page @bulletins, 'Next Page', :params => {:controller => 'widget/bulletins', :action => 'reload_bulletins', :part_id => params[:part_id], :tag_id => [@selected_tag.id]}, :remote => true, :class => 'next' %>
+	<%= link_to_previous_page @bulletins, 'Previous Page', :params => {:controller => 'widget/bulletins', :action => 'reload_bulletins', :tag_id => @selected_tag.id}, :remote => true, :class => 'previous' %>
+	<%= link_to_next_page @bulletins, 'Next Page', :params => {:controller => 'widget/bulletins', :action => 'reload_bulletins', :tag_id => @selected_tag.id}, :remote => true, :class => 'next' %>
 </div>

vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_tag.html.erb

@@ -1,3 +1,3 @@
 <li>
-	<%= link_to tag.name, panel_announcement_widget_bulletins_and_web_links_path(:inner=>true, :id => [tag.id], :part_id=>params[:part_id]), :remote => true, :class => ('active' if tag.eql?(@selected_tag)) %>
+	<%= link_to tag.name, panel_announcement_widget_bulletins_and_web_links_path(:id => tag.id), :remote => true, :class => ('active' if tag.eql?(@selected_tag)) %>
 </li>

vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_web_links.html.erb

@@ -5,6 +5,6 @@
 <% end %>
 
 <div class='pagination'>
-	<%= link_to_previous_page @web_links, 'Previous Page', :params => {:controller => 'widget/bulletins', :action => 'reload_web_links', :part_id => params[:part_id], :tag_id => @selected_tag.id}, :remote => true, :class => 'previous' %>
-	<%= link_to_next_page @web_links, 'Next Page', :params => {:controller => 'widget/bulletins', :action => 'reload_web_links', :part_id => params[:part_id], :tag_id => @selected_tag.id}, :remote => true, :class => 'next' %>
+	<%= link_to_previous_page @web_links, 'Previous Page', :params => {:controller => 'widget/bulletins', :action => 'reload_web_links', :tag_id => @selected_tag.id}, :remote => true, :class => 'previous' %>
+	<%= link_to_next_page @web_links, 'Next Page', :params => {:controller => 'widget/bulletins', :action => 'reload_web_links', :tag_id => @selected_tag.id}, :remote => true, :class => 'next' %>
 </div>

vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/bulletins_and_web_links.html.erb

@@ -1,36 +0,0 @@
-<div class="mega_tab_block">
-
-	<div class="tag_block">
-		<ul id='bulletins_web_links_tags' class="tag_list">
-			<%= render :partial => 'tag', :collection => @tags %>
-		</ul>
-	</div>
-
-	<div class="news_block">
-		<h3 class="news_title2">
-			<%#= link_to t("announcement.bulletins"), panel_announcement_front_end_bulletins_path, :class => 'more' %>
-			<%= link_to @title, panel_announcement_front_end_bulletins_path, :class => 'more' %>
-		</h3>
-		<ul id='bulletins_web_links_bulletins' class="news_list">
-			<%= render 'bulletins' if @bulletins %>
-		</ul>
-	</div>
-
-	<% if @part.widget_style == 'bulletins_and_web_links' %>
-
-	<div class="links_block">
-		<h3 class="links_title"><%= t(:related_links) %></h3>
-		<ul id='bulletins_web_links_web_links' class="links_list">
-			<%= render 'web_links' if @web_links %>
-		</ul>
-	</div>
-
-	<% end %>
-
-</div>
-
-<% content_for :page_specific_javascript do %>
-	<%= javascript_include_tag "news_link" %>
-<% end %>
-
-<%= stylesheet_link_tag "announcement/bulletins_and_web_links" %>

vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/bulletins_and_web_links.js.erb

@@ -1,3 +0,0 @@
-$('#bulletins_web_links_tags').html("<%= j render :partial => 'tag', :collection => @tags %>")
-$('#bulletins_web_links_bulletins').html("<%= j render 'bulletins' if @bulletins %>")
-$('#bulletins_web_links_web_links').html("<%= j render 'web_links' if @web_links %>")

vendor/built_in_modules/announcement/config/locales/en.yml

@@ -16,8 +16,6 @@ en:
       bulletin_category_with_title: Bulletin Category with Title
       postdate: Post Date
       title: Title
-      subtitle: SubTitle
-      bulletin_create_dept: Unit
     editing_announcement: Edit Announcement
     editing_announcement_category: Edit Category
     error:
@@ -36,7 +34,7 @@ en:
     update_bulletin_category_success: Update Category Successfully
     url: URL
     widget:
-      bulletins_and_web_links: Differential Nav.
+      bulletins_and_web_links: Bulletins and Web Resources
       index: Index
       search: Search
     email_eminder: Email Reminder

vendor/built_in_modules/announcement/config/locales/zh_tw.yml

@@ -16,8 +16,6 @@ zh_tw:
       bulletin_category_with_title: 公告類別及標題
       postdate: 張貼日期
       title: 標題
-      subtitle: 副標題
-      bulletin_create_dept: 單位
     editing_announcement: 編輯類別
     editing_announcement_category: 編輯類別
     error:
@@ -36,7 +34,7 @@ zh_tw:
     update_bulletin_category_success: 更新類別成功
     url: 連結位置
     widget:
-      bulletins_and_web_links: 分眾頁籤
+      bulletins_and_web_links: 索引
       index: 索引
       search: 搜尋
     email_eminder: 寄送提醒

vendor/built_in_modules/announcement/config/routes.rb

@@ -17,7 +17,6 @@ Rails.application.routes.draw do
             get 'load_quick_edit'
           end
           collection do
-            get "get_bulletins"
             post "preview"
             put "preview"
             get 'delete'
@@ -28,7 +27,6 @@ Rails.application.routes.draw do
 
         resources :bulletin_categorys do
           collection do
-            get "get_bulletin_categories"
             get 'get_categorys_json'
           end
           # if want to use json

vendor/built_in_modules/announcement/init.rb

@@ -23,21 +23,18 @@ module Announcement
     end
 
     category ["BulletinCategory"]
-    data_count 1..10
+    data_count 3..10
 
     taggable
 
     widgets do
       default_widget do
-	  sorting 'desc(:postdate)'
-        query 'Bulletin.available_for_lang(I18n.locale).any_of( {deadline: nil,:postdate.lte => Time.now} , {:deadline.gte => Time.now,:postdate.lte => Time.now} )'
-        enable ["typeA","typeB_style3","typeC"]
+        query 'Bulletin.any_of( {deadline: nil,:postdate.lte => Time.now} , {:deadline.gte => Time.now,:postdate.lte => Time.now} )'
+        enable ["typeA","typeC"]
         image :image
         field :postdate
-        link_field :title,{:method => 'panel_announcement_front_end_bulletin_path',:args=>:self,:preview=>true}
+        link_field :title,{:method => 'panel_announcement_front_end_bulletin_path',:args=>:self}
         link_field :bulletin_category_with_title,{:method => 'panel_announcement_front_end_bulletins_path',:args=>{:category_id => [:bulletin_category,:id]}}
-        field :subtitle
-        field :bulletin_create_dept
         link_to_more 'panel_announcement_front_end_bulletins_path',:title_i18n=> 'more_plus'
       end
 
@@ -53,11 +50,6 @@ module Announcement
         widget_i18n "announcement.widget.search"
       end
 
-      customize_widget "bulletins_and_web_links" do
-        widget_i18n "announcement.widget.bulletins_and_web_links"
-        style ["bulletins_and_links","bulletins_only"]
-      end
-
       # item "index","announcement.widget.index",:default_template=>true,:fields=>["title","category","postdate"]
       # item "bulletins_and_web_links","announcement.widget.bulletins_and_web_links"
     end

vendor/built_in_modules/ask/app/controllers/panel/ask/front_end/ask_questions_controller.rb

@@ -0,0 +1,28 @@
+class Panel::Ask::FrontEnd::AskQuestionsController < OrbitWidgetController
+
+  layout false
+
+  def initialize
+    super
+    @app_title = 'ask'
+  end
+
+  def index
+    @ask_question = AskQuestion.new
+  end
+
+  def create
+    @ask_question = AskQuestion.new(params[:ask_question])
+    if verify_recaptcha model: @ask_question,  private_key: '6Lfl7OESAAAAAD4rl5S16-zjt5yiKNYJ6jsqdwmL'
+      @ask_acknowledgement = AskAcknowledgement.first || AskAcknowlegement.new
+      @ask_question.save
+      AskAdmin.all.each do |ask_admin|
+        Resque.enqueue(SendAskNoticeMail, ask_admin.id, @ask_question.id)
+      end
+    end
+    respond_to do |format|
+      format.js
+    end
+  end
+
+end

vendor/built_in_modules/ask/app/mailers/ask_mailer.rb

@@ -1,6 +1,6 @@
 class AskMailer < ActionMailer::Base
   default from: 'orbit_test@rulingcom.com'
-  
+
   def reply(ask_question)
     @ask_question = ask_question
     mail(:to => @ask_question.email, :subject => "#{t('ask.reply')}:#{@ask_question.title}")

vendor/built_in_modules/ask/app/models/ask_question.rb

@@ -1,8 +1,4 @@
 class AskQuestion
-  include ActiveModel::Validations
-  include ActiveModel::Conversion
-  extend ActiveModel::Naming
-  
   include Mongoid::Document
   include Mongoid::Timestamps
   include OrbitCoreLib::ObjectDisable
@@ -19,5 +15,4 @@ class AskQuestion
 
   belongs_to :ask_category
   has_one :ask_reply, dependent: :destroy
-
 end

vendor/built_in_modules/ask/app/views/ask_mailer/reply.html.erb

@@ -5,7 +5,7 @@
   </head>
   <body>
     <p>
-      <%= @ask_question.content %>
+      <%= @ask_question.ask_reply.content %>
     </p>
     <p>此為系統自動發信，請勿直接回覆</p>
   </body>