Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

Conflicts:
	app/views/welcome/index.html.erb
	config/locales/zh.yml

.gitignore

@@ -7,8 +7,11 @@
 /config/configuration.yml
 /files/*
 /log/*
+/public/tmp/*
 /tmp/*
+/public/cache/*
 .gitignore
+/config/newrelic.yml
 /public/images/avatars/*
 /Gemfile
 /Gemfile.lock

.metadata/.plugins/org.eclipse.core.resources/.safetable/com.aptana.core.io.15

@@ -0,0 +1,3 @@
+#safe table
+#Mon Jan 05 10:27:54 CST 2015
+connections=connections.15

.metadata/.plugins/org.eclipse.core.resources/.safetable/com.aptana.syncing.core.15

@@ -0,0 +1,4 @@
+#safe table
+#Mon Jan 05 10:27:54 CST 2015
+defaultConnection=defaultConnection.15
+sites=sites.15

.metadata/.plugins/org.eclipse.core.resources/.safetable/com.aptana.webserver.core.12

@@ -0,0 +1,3 @@
+#safe table
+#Mon Jan 05 10:27:28 CST 2015
+webservers=webservers.12

.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/.workspace/2015/1/2/refactorings.history

@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<session version="1.0">&#x0A;<refactoring comment="Delete resource &apos;trustie2&apos;" deleteContents="false" description="Delete resource &apos;trustie2&apos;" element1="/trustie2" flags="7" id="org.eclipse.ltk.core.refactoring.delete.resources" resources="1" stamp="1420424676858"/>&#x0A;<refactoring comment="Delete resource &apos;trustie2&apos;" deleteContents="false" description="Delete resource &apos;trustie2&apos;" element1="/trustie2" flags="7" id="org.eclipse.ltk.core.refactoring.delete.resources" resources="1" stamp="1420424775104"/>
+</session>

.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/.workspace/2015/1/2/refactorings.index

@@ -0,0 +1,2 @@
+1420424676858	Delete resource 'trustie2'
+1420424775104	Delete resource 'trustie2'

.metadata/.plugins/org.eclipse.ltk.ui.refactoring/dialog_settings.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<section name="Workbench">
+	<section name="RefactoringWizard.preview">
+		<item value="400" key="height"/>
+		<item value="600" key="width"/>
+	</section>
+</section>

.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml

@@ -11,4 +11,16 @@
 		<item value="org.eclipse.rcp:3.7.2.v20120120-1424-9DB5FmnFq5JCf1UA38R-kz0S0272"/>
 		<item value="org.radrails.rails:3.4.2.201308081726-7n-7Z7oKfjkqlemv"/>
 	</list>
+	<section name="ChooseWorkspaceDialogSettings">
+		<item value="316" key="DIALOG_Y_ORIGIN"/>
+		<item value="656" key="DIALOG_X_ORIGIN"/>
+	</section>
+	<section name="WORKBENCH_SETTINGS">
+		<list key="ENABLED_TRANSFERS">
+		</list>
+	</section>
+	<section name="ExternalProjectImportWizard">
+		<item value="false" key="WizardProjectsImportPage.STORE_ARCHIVE_SELECTED"/>
+		<item value="false" key="WizardProjectsImportPage.STORE_COPY_PROJECT_ID"/>
+	</section>
 </section>

.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml

@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section name="Workbench">
+	<section name="NewWizardAction">
+	</section>
 	<section name="ImportExportAction">
-		<item value="com.aptana.projects.internal.wizards.PromoteToProjectWizard" key="ImportExportPage.STORE_SELECTED_IMPORT_WIZARD_ID"/>
+		<item value="org.eclipse.ui.wizards.import.ExternalProject" key="ImportExportPage.STORE_SELECTED_IMPORT_WIZARD_ID"/>
 		<list key="ImportExportPage.STORE_EXPANDED_IMPORT_CATEGORIES">
 			<item value="org.eclipse.ui.Basic"/>
 			<item value="com.aptana.git.ui.clone.category"/>

Gemfile

@@ -20,7 +20,8 @@ gem "builder", "3.0.0"
 gem 'acts-as-taggable-on', '2.4.1'
 gem 'spreadsheet'
 gem 'ruby-ole'
-#gem 'email_verifier'
+gem 'email_verifier'
+gem 'newrelic_rpm'
 
 group :development do
   gem 'grape-swagger'

app/assets/javascripts/system_log.js.coffee

@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/

app/assets/stylesheets/system_log.css.scss

@@ -0,0 +1,3 @@
+// Place all the styles related to the system_log controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/

app/controllers/poll_controller.rb

@@ -83,6 +83,12 @@ class PollController < ApplicationController
 
   def destroy
     if @poll && @poll.destroy
+      if @is_teacher
+        polls = Poll.where("polls_type = 'Course' and polls_group_id = #{@course.id}")
+      else
+        polls = Poll.where("polls_type = 'Course' and polls_group_id = #{@course.id} and polls_status = 2")
+      end
+      @polls = paginateHelper polls,20 #分页
       respond_to do |format|
         format.js
       end

app/controllers/projects_controller.rb

@@ -31,16 +31,14 @@ class ProjectsController < ApplicationController
   menu_item :feedback, :only => :feedback
   menu_item l(:label_course_file), :only => :index
   menu_item l(:label_course_news), :only => :index
+  
 
-# edit
-  before_filter :authorize1, :only => [:show]
-#
   before_filter :find_project, :except => [ :index, :search,:list, :new, :create, :copy, :statistics, :new_join, :course, :enterprise_course, :course_enterprise,:view_homework_attaches,:join_project]
   # before_filter :authorize, :except => [:new_join, :new_homework, :homework, :statistics, :search, :watcherlist, :index, :list, :new, :create, :copy, :archive, :unarchive, :destroy, :member, :focus, :file, 
   #               :statistics, :feedback, :course, :enterprise_course, :course_enterprise, :project_respond, :share,
   #               :show_projects_score, :issue_score_index, :news_score_index, :file_score_index, :code_submit_score_index, :projects_topic_score_index]
   #此条勿删 课程相关权限  ,:new_homework,:homework,:feedback,,:member
-  before_filter :authorize, :only => [:settings, :edit, :sort_project_members, :update, :modules, :close, :reopen,:view_homework_attaches,:course]
+  before_filter :authorize, :only => [:show, :settings, :edit, :sort_project_members, :update, :modules, :close, :reopen,:view_homework_attaches,:course]
   before_filter :authorize_global, :only => [:new, :create,:view_homework_attaches]
   before_filter :require_admin, :only => [ :copy, :archive, :unarchive, :destroy, :calendar]
   before_filter :file, :statistics, :watcherlist
@@ -118,8 +116,8 @@ class ProjectsController < ApplicationController
                       joins("LEFT JOIN #{ProjectStatus.table_name} ON #{Project.table_name}.id = #{ProjectStatus.table_name}.project_id").joins("LEFT JOIN #{ProjectScore.table_name} ON #{Project.table_name}.id = #{ProjectScore.table_name}.project_id").
                       where("#{Project.table_name}.project_type = ? ", Project::ProjectType_project)
 
-    @poll_questions_count = @projects_all.count
-    @poll_questions_pages = Paginator.new @project_count, per_page_option, params['page']
+    @project_count = @projects_all.count
+    @project_pages = Paginator.new @project_count, per_page_option, params['page']
 
 #gcm activity count
 
@@ -558,11 +556,6 @@ class ProjectsController < ApplicationController
 
   # Show @project
   def show
-    if(@project && !@project.is_public && !User.current.member_of?(@project))
-      render_403
-      return
-    end
-
     @project_type = params[:project_type]
     
     # try to redirect to the requested menu item
@@ -594,7 +587,7 @@ class ProjectsController < ApplicationController
     end
 
     has = {
-      "show_issues" => true,
+      "show_issues" => true ,
       "show_files" => true,
       "show_documents" => true,
       "show_messages" => true,
@@ -604,8 +597,8 @@ class ProjectsController < ApplicationController
       "show_wiki_edits"=>true,
       "show_journals_for_messages" => true
     }
-
-
+    @date_to ||= Date.today + 1
+    @date_from = @date_to - @days#-1.years #modified by lizanle 去掉這個1年的時間跨度
     @with_subprojects = params[:with_subprojects].nil? ? Setting.display_subprojects_issues? : (params[:with_subprojects] == '1')
     @author = (params[:user_id].blank? ? nil : User.active.find(params[:user_id]))
     # 决定显示所用用户或单个用户活动
@@ -619,9 +612,9 @@ class ProjectsController < ApplicationController
     # modify by nwb
     # 添加私密性判断
     if User.current.member_of?(@project)|| User.current.admin?
-      events = @activity.events(@days)
+      events = @activity.events(@date_from, @date_to)
     else
-      events = @activity.events(@days,nil, :is_public => 1)
+      events = @activity.events(@date_from, @date_to, :is_public => 1)
     end
 
     @offset, @limit = api_offset_and_limit({:limit => 10})

app/controllers/system_log_controller.rb

@@ -0,0 +1,59 @@
+# Time 2015-01-26 17:12:23
+# Author lizanle
+# Description 显示和清理系统日志
+class SystemLogController < ApplicationController
+
+  before_filter :require_admin
+  # 默认每页显示20条记录
+  PER_PAGE = 20
+  layout "base"
+  include SystemLogHelper
+
+  # Time 2015-01-26 17:12:46
+  # Author lizanle
+  # Description 查看所有日志
+  def index
+    @logs = SystemLog.logo_data(params[:page]||1, params[:per]||PER_PAGE, params[:search], params[:day])
+  end
+
+  # Time 2015-01-26 14:42:38
+  # Author lizanle
+  # Description 清除日志
+  def clear
+    SystemLog.clear params[:day]
+    redirect_to :action => :index
+  end
+
+  # Time 2015-01-26 17:24:25
+  # Author lizanle
+  # Description 访问分析
+  def access_analysis
+    #解析日志，然后逆序
+    @log_result = SystemLog.analysis(params[:day]).reverse[1...-1]
+    @access_module = Hash.new
+    #日誌可能為空
+    if @log_result && !@log_result.empty?
+      #将数组中的模块访问统计出来放到hash中 每条记录的第四个值是Controller#action的形式
+      @log_result.collect! { |r| @access_module[r[3]].nil? ?
+          @access_module[r[3]] = 1 : @access_module[r[3]] +=1 }
+      # 去掉key可能为空记录 排序，然后取逆序
+      @access_module = @access_module.delete_if { |k, v| k.nil? }.sort_by { |key, val| val }.reverse
+    else
+      @access_module
+    end
+  end
+
+  # Time 2015-01-26 17:24:36
+  # Author lizanle
+  # Description 耗时分析
+  def time_analysis
+    #解析日志
+    @log_result = SystemLog.analysis(params[:day]).reverse[1...-1]
+    if @log_result && !@log_result.empty?
+      #分页
+      @log_result = Kaminari.paginate_array(@log_result).page(params[:page]||1).per(params[:per]||PER_PAGE)
+    else
+      @log_result = []
+    end
+  end
+end

app/helpers/application_helper.rb

@@ -1963,6 +1963,15 @@ module ApplicationHelper
   end
 
   def get_technical_title user
-    #user.user_extensions.technical_title
+    if user.user_extensions.technical_title == "Professor" || user.user_extensions.technical_title == "教授"
+      technical_title = l(:label_technicl_title_professor)
+    elsif user.user_extensions.technical_title == "Associate professor" || user.user_extensions.technical_title == "副教授"
+      technical_title = l(:label_technicl_title_associate_professor)
+    elsif user.user_extensions.technical_title == "Lecturer" || user.user_extensions.technical_title == "讲师"
+      technical_title = l(:label_technicl_title_lecturer)
+    elsif user.user_extensions.technical_title == "Teaching assistant" || user.user_extensions.technical_title == "助教"
+      technical_title = l(:label_technicl_title_teaching_assistant)
+    end
+    technical_title
   end
 end

app/helpers/expire_helper.rb

@@ -0,0 +1,16 @@
+module ExpireHelper
+  #index.html 中 “projects”塊 緩存過期
+  def expire_project_cache
+    ActionController::Base.new.expire_fragment('projects')
+  end
+
+  #index.html 中 “activities”塊 緩存過期
+  def expire_activitie_cache
+    ActionController::Base.new.expire_fragment('activities')
+  end
+
+  #welcome/index.html 中 “forums”塊 緩存過期
+  def expire_forum_cache
+    ActionController::Base.new.expire_fragment('forums')
+  end
+end

app/helpers/system_log_helper.rb

@@ -0,0 +1,180 @@
+# Time 2015-01-26 17:30:16
+# Author lizanle
+# Description 日志帮助类
+module SystemLogHelper
+  class SystemLog
+    class << self
+      # Time 2015-01-26 17:29:17
+      # Author lizanle
+      # Description 分页（支持多关键字查询）
+      def logo_data(page, per, search, day)
+        logs = find_all_logs day
+        if logs.empty? #如果返回的是空數組，就說明日誌文件不存在
+          return logs
+        end
+        # 根据search参数来决定是否需要查询
+        keywords = search
+        if keywords && !keywords.strip.blank?
+          # 把keywords转化成正则表达式数组
+          keywords = keywords.strip.split(/\s+/).collect! { |w| Regexp.new(w, 'i') }
+          # 一条记录应该匹配每个关键字 log =~ r  是对log记录进行判断是否符合r的正则表达式
+          logs = logs.find_all do |log|
+            keywords.all? { |r| log =~ r }
+          end
+          #用Kaminari分页
+          logs = Kaminari.paginate_array(logs).page(page).per(per).collect! { |log| parse(log) }
+          #将分页后的记录的搜索结果添加样式，样式中的\0是给给r占位置的。
+          logs.collect! do |log|
+            keywords.each { |r| log.gsub!(r, '<span class="search_results">\0</span>') }
+            log
+          end
+        else
+          logs = Kaminari.paginate_array(logs).page(page).per(per).collect! { |log| parse(log) }
+        end
+        logs
+      end
+
+      # Time 2015-01-26 17:28:57
+      # Author lizanle
+      # Description 清除日誌
+      def clear day
+        if File::exists?(logfile_path day)
+          File.open(logfile_path(day), 'w') do |f|
+            f.print ''
+          end
+        else
+        end
+      end
+
+      # Time 2015-01-26 17:28:49
+      # Author lizanle
+      # Description 讀取日誌
+      private
+      def find_all_logs day
+        if File::exists?(logfile_path day)
+          File.open(logfile_path day) do |f|
+            #打开文件，并按照正则表达式切分，逆序，最新一个记录可以扔掉（因为最新的记录永远都是访问System_log)
+            f.read.split("Processing").reverse[1..-1]
+          end
+        else
+          []
+        end
+      end
+
+      # Time 2015-01-26 17:28:34
+      # Author lizanle
+      # Description  日志文件的路径，一般在Rails.root/log下，根据环境配置
+      # 依次记录到product.log development.log test.log中
+      def logfile_path day
+        #将日期处理成2015-01-01的形式
+        unless day.nil?
+          dayArr = day.split('-')
+          if dayArr[1].length == 1
+            dayArr[1] = "0" + dayArr[1]
+          end
+          if dayArr[2].length == 1
+            dayArr[2] = "0" + dayArr[2]
+          end
+          day = dayArr.join('-')
+        end
+        #如果不是當天，則需要加後綴
+        if !day.nil? && !day.strip.blank? && day != Time.now.strftime("%Y-%m-%d")
+          File.join(Rails.root, "log", "#{Rails.env}.log.#{day.gsub('-', '')}")
+        else
+          File.join(Rails.root, "log", "#{Rails.env}.log")
+        end
+      end
+
+      # Time 2015-01-26 17:28:22
+      # Author lizanle
+      # Description 替換換行符
+      def parse(log)
+        ERB::Util.html_escape(log.gsub(/\e\[[\d;m]+/, '')).gsub("\n", "<br/>")
+      end
+
+      # Time 2015-01-26 17:28:07
+      # Author lizanle
+      # Description 定义响应正则表达式 2015-01-20 11:31:13 INFO -- Completed 200 OK in 125ms (Views: 81.0ms | ActiveRecord: 2.0ms)
+      def response_regex
+        'Completed \d+ \w+ in (\d+)ms \(Views: (\d+\.\d+)?ms \| ActiveRecord: (\d+\.\d+)?ms\)'
+      end
+
+      # Time 2015-01-26 17:27:51
+      # Author lizanle
+      # Description 将一条记录中的地址主机等都分析出来
+      def get_status(paragraph)
+        request_regex = 'Started GET \"(\/.*)\" for ([\d]+\.[\d]+\.[\d]+\.[\d]+) at [\d]*-([\d]*-[\d]* [\d]*:[\d]*:[\d]*)'
+        controller_regex = 'Processing by ([\w]+#[\w]+)'
+        page_time_regex = 'Views: \d+(\.\d+)?ms'
+        activeRecord_time_regex = 'ActiveRecord: \d+(\.\d+)?ms'
+
+        #解析请求中的正则，主机，时间
+        if paragraph.match(request_regex) != nil
+          request_url = paragraph.match(request_regex)[1] #正则表达式中的括号能够截取成数组
+          request_host = paragraph.match(request_regex)[2]
+          request_at = paragraph.match(request_regex)[3]
+        end
+
+        #解析控制器
+        if paragraph.match(controller_regex) != nil
+          controller_name = paragraph.match(controller_regex)[1]
+        end
+
+        #解析响应时间以及计算百分比
+        if paragraph.match(response_regex) != nil
+          #print(paragraph.match(response_regex))
+          total_time = paragraph.match(response_regex)[1]
+          page_time = paragraph.match(response_regex)[2]
+          activeRecord_time = paragraph.match(response_regex)[3]
+          page_time_percent = page_time.to_f/(total_time.to_f)
+          activeRecord_time_percent = activeRecord_time.to_f/(total_time.to_f)
+        else
+        end
+        #将解析结果当做一条记录数组返回
+        request_status = [request_url, request_host, request_at,
+                          controller_name, total_time, page_time, page_time_percent, activeRecord_time, activeRecord_time_percent]
+        request_status
+      end
+
+      # Time 2015-01-26 16:41:51
+      # Author lizanle
+      # Description 分析日志
+      public
+      def analysis day
+        csv = Array.new
+        #如果文件不存在，则直接返回空数组
+        if File::exists?(logfile_path day)
+          File.open(logfile_path(day), "r:utf-8") do |file|
+            paragraph = ""
+            begin_flag = false
+            # 对每一行进行判断
+            file.each do |line|
+              # 以"Started GET "开头为一个paragraph
+              #print(line.match('[\d]*-([\d]*-[\d]* [\d]*:[\d]*:[\d]*) INFO -- Started GET ') == nil)
+              if (line.match('[\d]*-([\d]*-[\d]* [\d]*:[\d]*:[\d]*) \w+ -- Started GET ') != nil)
+                if !begin_flag
+                  begin_flag = true
+                  paragraph.concat(line)
+                else
+                  # 另一个paragraph的开头
+                  if (paragraph.match(response_regex) != nil)
+                    csv << get_status(paragraph)
+                  end
+                  begin_flag = true
+                  paragraph = line
+                end
+              else
+                if begin_flag
+                  paragraph.concat(line)
+                else
+                end
+              end
+            end
+          end
+        end
+        csv
+      end
+    end
+  end
+end
+

app/models/bid.rb

@@ -17,6 +17,7 @@ class Bid < ActiveRecord::Base
   HomeworkProject = 2
   attr_accessible :author_id, :budget, :deadline, :name, :description, :homework_type, :password
   include Redmine::SafeAttributes
+  include ExpireHelper
 
   belongs_to :author, :class_name => 'User', :foreign_key => :author_id
   belongs_to :course
@@ -32,7 +33,11 @@ class Bid < ActiveRecord::Base
   has_many :join_in_contests, :dependent => :destroy
   has_many :praise_tread, as: :praise_tread_object, dependent: :destroy
   # has_many :fork_homework, :class_name => 'Bid', :conditions => "#{Bid.table_name}.parent_id = #{id}"
-  
+
+
+  after_create :expire_activitie_cache
+  after_update :expire_activitie_cache
+  before_destroy :expire_activitie_cache
 
   acts_as_attachable
 
@@ -149,4 +154,6 @@ class Bid < ActiveRecord::Base
       end
     end
   end
+
+
 end

app/models/changeset.rb

@@ -16,6 +16,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class Changeset < ActiveRecord::Base
+  include ExpireHelper
   belongs_to :repository
   belongs_to :user
   include UserScoreHelper
@@ -64,8 +65,9 @@ class Changeset < ActiveRecord::Base
     includes(:repository => :project).where(Project.allowed_to_condition(args.shift || User.current, :view_changesets, *args))
   }
 
-  after_create :scan_for_issues,:refresh_changests#:be_user_score # user_score
-  after_update :be_user_score
+  after_create :scan_for_issues,:refresh_changests,:expire_activitie_cache#:be_user_score # user_score
+  after_update :be_user_score,:expire_activitie_cache
+  before_destroy :expire_activitie_cache
   after_destroy :down_user_score
   before_create :before_create_cs
   

app/models/contest_notification.rb

@@ -1,4 +1,10 @@
 class ContestNotification < ActiveRecord::Base
+  include ExpireHelper
   attr_accessible :content, :title
   validates :title, length: {maximum: 30}
+  after_create :expire_forum_cache
+  after_update :expire_forum_cache
+  before_destroy :expire_forum_cache
+
+
 end

app/models/document.rb

@@ -17,18 +17,22 @@
 
 class Document < ActiveRecord::Base
   include Redmine::SafeAttributes
+  include ExpireHelper
   belongs_to :project
   belongs_to :user
   belongs_to :category, :class_name => "DocumentCategory", :foreign_key => "category_id"
   include UserScoreHelper
   after_save :be_user_score # user_score
   after_destroy :down_user_score
-
+  after_create :expire_activitie_cache
+  after_update :expire_activitie_cache
+  before_destroy :expire_activitie_cache
   acts_as_attachable :delete_permission => :delete_documents
 
   acts_as_searchable :columns => ['title', "#{table_name}.description"], :include => :project
   acts_as_event :title => Proc.new {|o| "#{l(:label_document)}: #{o.title}"},
-                :author => Proc.new {|o| o.attachments.reorder("#{Attachment.table_name}.created_on ASC").first.try(:author) },
+                #:author => Proc.new {|o| o.attachments.reorder("#{Attachment.table_name}.created_on ASC").first.try(:author) },
+                :author => Proc.new {|o| User.find(o.user_id)},
                 :url => Proc.new {|o| {:controller => 'documents', :action => 'show', :id => o.id}}
   acts_as_activity_provider :find_options => {:include => :project},
                             :is_public => 'documents.is_public'
@@ -76,4 +80,6 @@ class Document < ActiveRecord::Base
     update_document(self.user,1)
     update_document(self.user,2,self.project)
   end
+
+
 end

app/models/forum.rb

@@ -1,8 +1,13 @@
 class Forum < ActiveRecord::Base
   include Redmine::SafeAttributes
+  include ExpireHelper
   has_many :topics, :class_name => 'Memo', :conditions => "#{Memo.table_name}.parent_id IS NULL", :order => "#{Memo.table_name}.created_at DESC", :dependent => :destroy
   has_many :memos, :dependent => :destroy, conditions: "parent_id IS NULL"
-  belongs_to :creator, :class_name => "User", :foreign_key => 'creator_id' 
+  belongs_to :creator, :class_name => "User", :foreign_key => 'creator_id'
+
+  after_create :expire_forum_cache
+  after_update :expire_forum_cache
+  before_destroy :expire_forum_cache
   safe_attributes 'name',
   'description',
   'topic_count',
@@ -45,5 +50,7 @@ class Forum < ActiveRecord::Base
      " memo_count = (SELECT COUNT(*) FROM #{Memo.table_name} WHERE forum_id=#{forum_id} AND parent_id IS NOT NULL)," +
      " last_memo_id = (SELECT MAX(id) FROM #{Memo.table_name} WHERE forum_id=#{forum_id})",
      ["id = ?", forum_id])
-  end 
+  end
+
+
 end

app/models/issue.rb

@@ -19,7 +19,7 @@ class Issue < ActiveRecord::Base
   include Redmine::SafeAttributes
   include Redmine::Utils::DateCalculation
   include UserScoreHelper
-
+  include ExpireHelper
   belongs_to :project
   belongs_to :tracker
   belongs_to :status, :class_name => 'IssueStatus', :foreign_key => 'status_id'
@@ -80,6 +80,9 @@ class Issue < ActiveRecord::Base
   after_create :act_as_activity,:be_user_score_new_issue
   after_update :be_user_score
   after_destroy :down_user_score
+  after_create :expire_activitie_cache
+  after_update :expire_activitie_cache
+  before_destroy :expire_activitie_cache
   # after_create :be_user_score
   # end
   
@@ -1553,4 +1556,5 @@ class Issue < ActiveRecord::Base
   end
 
 
+
 end