Merge branch 'szzh' into develop

app/api/mobile/apis/comments.rb

@@ -72,6 +72,20 @@ module Mobile
           present :status, 0
         end
 
+        desc ' 意见反馈'
+        params do
+          requires :token, type: String
+          requires :subject,type: String,desc: '意见'
+        end
+        post do
+          cs_params = {
+              memo: {:subject => params[:subject],:content => '该贴来自手机App意见反馈'},
+          }
+          cs = CommentService.new
+          memo = cs.create_feedback cs_params, current_user
+          raise "commit failed #{memo.errors.full_messages}" if memo.new_record?
+          present :status, 0
+        end
 
       end
     end

app/api/mobile/entities/anonymous_works_params.rb

@@ -15,6 +15,7 @@ module Mobile
       anonymous_works_params_expose :m_score
       anonymous_works_params_expose :is_anonymous_comments
       anonymous_works_params_expose :cur_type
+      anonymous_works_params_expose :cur_page
       expose :jours ,using: Mobile::Entities::Jours do |f, opt|
         if f.is_a?(Hash) && f.key?(:jours)
           f[:jours]

app/api/mobile/entities/homework.rb

@@ -52,6 +52,10 @@ module Mobile
       homework_expose :created_on
       homework_expose :deadline
 
+      expose :jours,using: Mobile::Entities::Jours  do |f, opt|
+        f[:jours] if f.is_a?(Hash) && f.key?(:jours)
+      end
+
       expose :homework_for_anonymous_comments,using: Mobile::Entities::HomeworkAttach  do |f, opt|
         f[:homework_for_anonymous_comments] if f.is_a?(Hash) && f.key?(:homework_for_anonymous_comments)
       end

app/controllers/admin_controller.rb

@@ -322,4 +322,11 @@ class AdminController < ApplicationController
     end
   end
 
+  #组织
+  def organization
+    @organizations = Organization.all
+    respond_to do |format|
+      format.html
+    end
+  end
 end

app/controllers/attachments_controller.rb

@@ -186,6 +186,10 @@ class AttachmentsController < ApplicationController
 
     @attachment = Attachment.new(:file => request.raw_post)
     @attachment.author = User.current
+    if !params[:project].nil?
+      @attachment.container_type = 'Project'
+      @attachment.container_id = params[:project].split("?")[0]
+    end
     @attachment.filename = params[:filename].presence || Redmine::Utils.random_hex(16)
     saved = @attachment.save
 

app/controllers/forums_controller.rb

@@ -15,12 +15,14 @@ class ForumsController < ApplicationController
   PageLimit = 20
   def create_feedback
     if User.current.logged?
-      @memo = Memo.new(params[:memo])
+      #@memo = Memo.new(params[:memo])
-      @memo.forum_id = "1"
+      #@memo.forum_id = "1"
-      @memo.author_id = User.current.id
+      #@memo.author_id = User.current.id
       #@forum = @memo.forum
+      cs = CommentService.new
+      @memo = cs.create_feedback params,User.current
       respond_to do |format|
-        if @memo.save
+        if !@memo.new_record?
           format.html { redirect_to forum_path(@memo.forum) }
         else
           sort_init 'updated_at', 'desc'

app/controllers/issues_controller.rb

@@ -153,6 +153,8 @@ class IssuesController < ApplicationController
   def create
     call_hook(:controller_issues_new_before_save, { :params => params, :issue => @issue })
     @issue.save_attachments(params[:attachments] || (params[:issue] && params[:issue][:uploads]))
+    # 给该issue在它所在的项目中所有的issues中所在的位置给一个序号
+    @issue.project_issues_index = @issue.project.issues.last.project_issues_index + 1
     if @issue.save
       call_hook(:controller_issues_new_after_save, { :params => params, :issue => @issue})
       respond_to do |format|

app/controllers/organization_controller.rb

@@ -0,0 +1,55 @@
+class OrganizationController < ApplicationController
+  layout 'project_base'
+  before_filter :require_admin, :except => [:index]
+
+  def index
+    #@projects = Project.find_by_sql("SELECT * FROM projects WHERE id  IN (select MAX(id) from projects GROUP BY enterprise_name)")
+    @organizations = Organization.all
+    respond_to do |format|
+      format.html
+    end
+  end
+
+  def new
+    @organizations = Organization.new
+    respond_to do |format|
+      format.html
+    end
+  end
+
+  def create
+    @organizations = Organization.new
+    @organizations.name = params[:organization][:name]
+    if @organizations.save
+      redirect_to admin_organization_url
+    end
+  end
+
+  def edit
+    @organization = Organization.find params[:id]
+    respond_to do |format|
+      format.html
+    end
+  rescue Exception => e
+    render_404
+  end
+
+  def update
+    @organization = Organization.find params[:id]
+    @organization.name = params[:organization][:name]
+    if @organization.save
+      redirect_to admin_organization_url
+    end
+  rescue Exception => e
+    render_404
+  end
+
+  def destroy
+    @organization = Organization.find params[:id]
+    if @organization.destroy
+      redirect_to admin_organization_url
+    end
+  rescue Exception => e
+    render_404
+  end
+end

app/controllers/organizations_controller.rb

@@ -1,6 +0,0 @@
-class OrganizationsController < ApplicationController
-  layout 'project_base'
-  def index
-    @projects = Project.find_by_sql("SELECT * FROM projects WHERE id  IN (select MAX(id) from projects GROUP BY enterprise_name)")
-  end
-end

app/controllers/projects_controller.rb

@@ -179,6 +179,7 @@ class ProjectsController < ApplicationController
     @trackers = Tracker.sorted.all
     @project = Project.new
     @project.safe_attributes = params[:project]
+    @project.organization_id = params[:organization_id]
     if validate_parent_id && @project.save
       @project.set_allowed_parent!(params[:project]['parent_id']) if params[:project].has_key?('parent_id')
       # Add current user as a project member if he is not admin
@@ -248,6 +249,7 @@ class ProjectsController < ApplicationController
   # Author lizanle
   # Description  项目动态展示方法，删除了不必要的代码
   def show
+=begin
     # 试图跳转到请求的按钮
     if params[:login]
       login = params[:login]
@@ -282,30 +284,37 @@ class ProjectsController < ApplicationController
     # 时间跨度不能太大，不然很慢，所以删掉了-1.years
     @date_from = @date_to - @days
     @with_subprojects = params[:with_subprojects].nil? ? Setting.display_subprojects_issues? : (params[:with_subprojects] == '1')
+=end
+
     @author = params[:user_id].blank? ? nil : User.active.find(params[:user_id])
     # 决定显示所用用户或单个用户活动
+=begin
     @activity = Redmine::Activity::Fetcher.new(User.current,
                                                    :project => @project,
                                                    :with_subprojects => @with_subprojects,
                                                    :author => @author)
     @activity.scope_select {|t| !has["show_#{t}"].nil?}
+=end
 
     # 根据私密性，取出符合条件的所有数据
     if User.current.member_of?(@project) || User.current.admin?
-      events = @activity.events(@date_from, @date_to)
+      @events_pages = ForgeActivity.where("project_id = ?",@project).order("created_at desc").page(params['page'|| 1]).per(20);
+      #events = @activity.events(@date_from, @date_to)
     else
-      events = @activity.events(@date_from, @date_to, :is_public => 1)
+      @events_pages = ForgeActivity.includes(:project).where("forge_activities.project_id = ? and projects.is_public
+                                                    = ?",@project,1).order("created_at desc")
+                                                          .page(params['page'|| 1]).per(10);
+     # @events = @activity.events(@date_from, @date_to, :is_public => 1)
     end
 
 
-    @offset, @limit = api_offset_and_limit({:limit => 10})
+=begin
-    @events_count = events.count
+    @events_pages = Paginator.new events.count, 10, params['page']
-    @events_pages = Paginator.new @events_count, @limit, params['page']
-    @offset ||= @events_pages.offset
     # 总的数据中取出某一页
-    events = events.slice(@offset,@limit)
+    events = events.slice(@events_pages.offset,10)
     # 按天分组
     @events_by_day = events.group_by {|event| User.current.time_to_date(event.event_datetime)}
+=end
 
     # 根据对应的请求，返回对应的数据
     respond_to do |format|
@@ -404,6 +413,7 @@ class ProjectsController < ApplicationController
 
   def update
     @project.safe_attributes = params[:project]
+    @project.organization_id = params[:organization_id]
     #@project.dts_test = params[:project][:dts_test]
     if validate_parent_id && @project.save
       @course = Course.find_by_extra(@project.identifier)

app/controllers/users_controller.rb

@@ -408,6 +408,9 @@ class UsersController < ApplicationController
   
   def show
     pre_count = 10 #limit
+    # Time 2015-02-04 11:46:34
+    # Author lizanle
+    # Description type 1 :所有动态包括我关注的人 type 2:我的动态 type 3:关于我的回复
     case params[:type]
     when "1"
       if @user == User.current
@@ -428,26 +431,27 @@ class UsersController < ApplicationController
       messages = message.sort {|x,y| y.created_on <=> x.created_on }
       @message = messages[@info_pages.offset, @info_pages.per_page]
       @state = 2
-    else
+      else
+      # Time 2015-02-04 10:50:49
+      # Author lizanle
+      # Description 所有动态
       where_condition = nil;
       # where_condition = "act_type <> 'JournalsForMessage'"
       if @user == User.current
         watcher = User.watched_by(@user)
         watcher.push(User.current)
-        activity = Activity.where(where_condition).where('user_id in (?)', watcher).order('id desc') 
+        activity = Activity.where(where_condition).where('user_id in (?)', watcher).order('id desc')
       else
         activity = Activity.where(where_condition).where('user_id = ?', @user.id).order('id desc') 
       end
-
       @activity_count = activity.count
       @activity_pages = Paginator.new @activity_count, pre_count, params['page']
-      activity_page = activity.slice(@activity_pages.offset,@activity_pages.per_page * 2)
+      @activity = activity.slice(@activity_pages.offset,@activity_pages.per_page )
-      activity_page = activity_page.reject { |e|
+      @activity = @activity.reject { |e|
         ((e.act_type=="Issue") && ( !e.act.visible?(User.current))) ||
             ((e.act_type == "Journal") && (!e.act.project.visible?(User.current))) ||
             ((e.act_type == "Bid") && ((!User.current.member_of_course?(e.act.courses.first) || !User.current.admin?)))
       }
-      @activity = activity.slice(0,@activity_pages.per_page)
       @state = 0
     end
     

app/controllers/welcome_controller.rb

@@ -27,28 +27,31 @@ class WelcomeController < ApplicationController
   def index
     # 企业版定制: params[:project]为传过来的参数
     unless params[:organization].nil?
-      @cur_projects = Project.find(params[:organization])
+      @organization = Organization.find params[:organization]
-      @organization = @cur_projects.enterprise_name              
+      @organization_projects = Project.visible.joins(:project_status).joins("LEFT JOIN project_scores ON projects.id = project_scores.project_id").where("projects.organization_id = ?", @organization.id).order("score DESC").limit(10).all
-      @organization_projects = (current_user.admin? || User.current.member_of?(@cur_projects)) ? Project.where("enterprise_name =? ", @organization) : Project.all_public.where("enterprise_name =? ", @organization)    
+      @part_projects = @organization_projects.count < 9 ? find_miracle_project( 9 - @organization_projects.count, 3,"score desc") : []
-      @e_count = @organization_projects.count
+      # @cur_projects = Project.find(params[:organization])
-      @part_projects = []
+      # @organization = @cur_projects.enterprise_name
-      # 取十个
+      # @organization_projects = (current_user.admin? || User.current.member_of?(@cur_projects)) ? Project.where("enterprise_name =? ", @organization) : Project.all_public.where("enterprise_name =? ", @organization)
-      @organization_projects.each do |obj| 
+      # @e_count = @organization_projects.count
-        break if(@organization_projects[10] == obj)
+      # @part_projects = []
-        @part_projects << Project.visible.find_by_id("#{obj.id}") unless obj.id.nil?
+      # # 取十个
-      end
+      # @organization_projects.each do |obj|
-      # 不够十个的用最火项目替代
+      #   break if(@organization_projects[10] == obj)
-      @e_count < 9 ? @part_projects = find_miracle_project( 9 - @e_count, 3,"score desc") : @part_projects
+      #   @part_projects << Project.visible.find_by_id("#{obj.id}") unless obj.id.nil?
-      # 配置文件首页定制
+      # end
+      # # 不够十个的用最火项目替代
+      # @e_count < 9 ? @part_projects = find_miracle_project( 9 - @e_count, 3,"score desc") : @part_projects
+      # # 配置文件首页定制
       @enterprise_page = FirstPage.find_by_page_type('enterprise')
       if @enterprise_page.nil?
         @enterprise_page = FirstPage.new
         @enterprise_page.page_type = 'enterprise'
       end
-      # 主页配置部分结束    
+      # 主页配置部分结束
-      
     end
     # end 企业版定制结束
+
     if @first_page.nil? ||  @first_page.sort_type.nil?
       @projects = find_miracle_project(10, 3,"score desc")
     else
@@ -74,7 +77,8 @@ class WelcomeController < ApplicationController
           @projects = @projects_all.order("score desc")
       end
     end
-
+  rescue Exception => e
+    render_404
   end
 
   def robots

app/helpers/expire_helper.rb

@@ -1,16 +0,0 @@
-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/projects_helper.rb

@@ -371,4 +371,15 @@ module ProjectsHelper
 
     return projects
   end
+
+  def project_organizations_id_option
+    type = []
+    Organization.all.each do |org|
+      option = []
+      option << org.name
+      option << org.id
+      type << option
+    end
+    type
+  end
 end

app/models/attachment.rb

@@ -25,7 +25,9 @@ class Attachment < ActiveRecord::Base
   belongs_to :softapplication, foreign_key: 'container_id', conditions: "attachments.container_type = 'Softapplication'"
   belongs_to :author, :class_name => "User", :foreign_key => "author_id"
   belongs_to :attachmentstype,  :foreign_key => "attachtype",:primary_key => "id"
-
+  # 被ForgeActivity虚拟关联
+  has_many :forge_acts, :class_name => 'ForgeActivity',:as =>:forge_act ,:dependent => :destroy
+  # end
   include UserScoreHelper
 
   validates :filename, presence: true, length: {maximum: 254}
@@ -70,7 +72,7 @@ class Attachment < ActiveRecord::Base
   @@thumbnails_storage_path = File.join(Rails.root, "tmp", "thumbnails")
 
   before_save :files_to_final_location
-  after_create :be_user_score # user_score
+  after_create :be_user_score ,:act_as_forge_activity# user_score
   after_update :be_user_score
   after_destroy :delete_from_disk,:down_user_score
 
@@ -529,4 +531,14 @@ class Attachment < ActiveRecord::Base
     end
   end
 
+  # Time 2015-03-02 17:42:48
+  # Author lizanle
+  # Description 上传该项目的文档资料也要保存一份在公共表中
+  def act_as_forge_activity
+    if self.container_type == 'Project'
+     self.forge_acts << ForgeActivity.new(:user_id => self.author_id,
+                                            :project_id => self.container_id)
+    end
+  end
+
 end

app/models/bid.rb

@@ -17,7 +17,6 @@ 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
@@ -33,12 +32,6 @@ 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
 
   NAME_LENGTH_LIMIT = 60

app/models/changeset.rb

@@ -16,7 +16,6 @@
 # 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
@@ -65,9 +64,8 @@ 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,:expire_activitie_cache#:be_user_score # user_score
+  after_create :scan_for_issues,:refresh_changests#:be_user_score # user_score
-  after_update :be_user_score,:expire_activitie_cache
+  after_update :be_user_score
-  before_destroy :expire_activitie_cache
   after_destroy :down_user_score
   before_create :before_create_cs
   

app/models/contest_notification.rb

@@ -1,10 +1,6 @@
 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,16 @@
 
 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
-
+  # 被ForgeActivity虚拟关联
+  has_many :forge_acts, :class_name => 'ForgeActivity',:as =>:forge_act ,:dependent => :destroy
+  # end
   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) },
@@ -39,7 +37,7 @@ class Document < ActiveRecord::Base
 
   validates_presence_of :project, :title, :category
   validates_length_of :title, :maximum => 60
-
+  after_create :act_as_forge_activity
   scope :visible, lambda {|*args|
     includes(:project).where(Project.allowed_to_condition(args.shift || User.current, :view_documents, *args))
   }
@@ -81,5 +79,12 @@ class Document < ActiveRecord::Base
     update_document(self.user,2,self.project)
   end
 
+  # Time 2015-03-02 10:51:16
+  # Author lizanle
+  # Description 新创建的document要在公共表ForgeActivity中记录
+  def act_as_forge_activity
+    self.forge_acts << ForgeActivity.new(:user_id => self.user_id,
+                                         :project_id => self.project_id)
+  end
 
 end

app/models/forge_activity.rb

@@ -0,0 +1,22 @@
+# Time 2015-02-06 10:42:34
+# Author lizanle
+# Description 这是保存Project相关的动态的公共表
+class ForgeActivity < ActiveRecord::Base
+  # 公共表中活动类型,命名规则:TYPE_OF_{类名}_ACT
+  TYPE_OF_ISSUE_ACT = "Issue"
+  TYPE_OF_MESSAGE_ACT = "Message"
+  TYPE_OF_ATTACHMENT_ACT = "Attachment"
+  TYPE_OF_DOCUMENT_ACT = "Document"
+  TYPE_OF_JOURNAL_ACT = "Journal"
+  TYPE_OF_WIKI_ACT = "Wiki"
+  TYPE_OF_NEWS_ACT = "News"
+  attr_accessible :forge_act_id, :forge_act_type,:project_id,:user_id,:org_id
+  # 虚拟关联
+  belongs_to :forge_act ,:polymorphic => true
+  belongs_to :project
+  belongs_to :user
+  validates :user_id,presence: true
+  validates :project_id,presence: true
+  validates :forge_act_id,presence: true
+  validates :forge_act_type, presence: true
+end

app/models/forum.rb

@@ -1,13 +1,8 @@
 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'
-
-  after_create :expire_forum_cache
-  after_update :expire_forum_cache
-  before_destroy :expire_forum_cache
   safe_attributes 'name',
   'description',
   'topic_count',

app/models/issue.rb

@@ -19,7 +19,6 @@ 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'
@@ -46,6 +45,8 @@ class Issue < ActiveRecord::Base
   
   # added by fq
   has_many :acts, :class_name => 'Activity', :as => :act, :dependent => :destroy
+  # 被ForgeActivity虚拟关联
+  has_many :forge_acts, :class_name => 'ForgeActivity',:as =>:forge_act ,:dependent => :destroy
   # end
   has_many :praise_tread, as: :praise_tread_object, dependent: :destroy
 
@@ -64,7 +65,9 @@ class Issue < ActiveRecord::Base
                         },
                 :url => Proc.new {|o| {:controller => 'issues', :action => 'show', :id => o}},
                 :type => Proc.new {|o| 'issue' + (o.closed? ? ' closed' : '') }
-
+  # Time 2015-01-31 13:52:53
+  # Author lizanle
+  # Description 将hash传进去
   acts_as_activity_provider :find_options => {:include => [:project, :author, :tracker]},
                             :author_key => :author_id
                             
@@ -77,12 +80,9 @@ class Issue < ActiveRecord::Base
   attr_reader :current_journal
   
   # fq
-  after_create :act_as_activity,:be_user_score_new_issue
+  after_create :act_as_activity,:be_user_score_new_issue,:act_as_forge_activity
   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
   
@@ -129,7 +129,15 @@ class Issue < ActiveRecord::Base
     self.acts << Activity.new(:user_id => self.author_id)
   end
   # end
-  
+
+  # Time 2015-02-26 10:51:16
+  # Author lizanle
+  # Description 新创建的issue要在公共表ForgeActivity中记录
+  def act_as_forge_activity
+    self.forge_acts << ForgeActivity.new(:user_id => self.author_id,
+                                           :project_id => self.project_id)
+  end
+  # end
   
   
   # Returns a SQL conditions string used to find all issues visible by the specified user
@@ -1168,13 +1176,13 @@ class Issue < ActiveRecord::Base
 
   # back string obj which is belong to project.
   def source_from
-    "" << self.project.name.to_s <<
+    "" << self.project.name.to_s
-    "#" << project_index
   end
 
   def project_index
     if self.project.issues.include?(self)
       (self.project.issues.index(self).to_i + 1).to_s
+
     else
       issue_index = 1
       self.project.issues.each do |issue|
@@ -1185,8 +1193,10 @@ class Issue < ActiveRecord::Base
          issue_index = issue_index+1
         end
       end
+
       issue_index.to_s
     end
+
   end
 
   private

app/models/journal.rb

@@ -27,6 +27,8 @@ class Journal < ActiveRecord::Base
   # added by fq
   has_one :journal_reply
   has_many :acts, :class_name => 'Activity', :as => :act, :dependent => :destroy
+  # 被ForgeActivity虚拟关联
+  has_many :forge_acts, :class_name => 'ForgeActivity',:as =>:forge_act ,:dependent => :destroy
   # end
   attr_accessor :indice
 
@@ -46,7 +48,7 @@ class Journal < ActiveRecord::Base
   before_create :split_private_notes
   
   # fq
-  after_save :act_as_activity,:be_user_score
+  after_save :act_as_activity,:be_user_score,:act_as_forge_activity
   # end
   #after_destroy :down_user_score
   #before_save :be_user_score
@@ -156,6 +158,15 @@ class Journal < ActiveRecord::Base
   end
   # end
 
+  # Time 2015-02-27 13:30:19
+  # Author lizanle
+  # Description 公共表中需要保存一份该记录
+  def act_as_forge_activity
+    self.forge_acts << ForgeActivity.new(:user_id => self.user_id,
+                                           :project_id => self.issue.project.id)
+
+  end
+
   # 更新用户分数     -by zjc
   def be_user_score
       #新建了缺陷留言且留言不为空，不为空白

app/models/journals_for_message.rb

@@ -4,7 +4,6 @@
 class JournalsForMessage < ActiveRecord::Base
   include Redmine::SafeAttributes
   include UserScoreHelper
-  include ExpireHelper
   safe_attributes   "jour_type", # 留言所属类型
                       "jour_id", # 留言所属类型的id
                         "notes", # 留言内容
@@ -55,9 +54,7 @@ class JournalsForMessage < ActiveRecord::Base
   has_many :acts, :class_name => 'Activity', :as => :act, :dependent => :destroy
 
   validates :notes, presence: true
-  after_create :act_as_activity ,:expire_activitie_cache#huang
+  after_create :act_as_activity #huang
-  after_update :expire_activitie_cache
-  before_destroy :expire_activitie_cache
   after_create :reset_counters!
   after_destroy :reset_counters!
   after_save :be_user_score

app/models/memo.rb

@@ -1,13 +1,8 @@
 class Memo < ActiveRecord::Base
 	include Redmine::SafeAttributes
   include UserScoreHelper
-  include ExpireHelper
 	belongs_to :forum
 	belongs_to :author, :class_name => "User", :foreign_key => 'author_id'
-
-  after_create :expire_cache
-  after_update :expire_cache
-  before_destroy :expire_cache
 	validates_presence_of :author_id, :forum_id, :subject,:content
 	# 若是主题帖，则内容可以是空
 	#validates :content, presence: true, if: Proc.new{|o| !o.parent_id.nil? }
@@ -174,8 +169,5 @@ class Memo < ActiveRecord::Base
     update_memo_number(User.current,1)
     update_replay_for_memo(User.current,1)
   end
-  def expire_cache
+
-    expire_forum_cache
-    expire_activitie_cache
-  end
 end

app/models/message.rb

@@ -18,7 +18,6 @@
 class Message < ActiveRecord::Base
   include Redmine::SafeAttributes
   include UserScoreHelper
-  include ExpireHelper
   belongs_to :board
   belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
   has_many :praise_tread, as: :praise_tread_object, dependent: :destroy
@@ -29,6 +28,8 @@ class Message < ActiveRecord::Base
   
   # added by fq
   has_many :acts, :class_name => 'Activity', :as => :act, :dependent => :destroy
+  # 被ForgeActivity虚拟关联
+  has_many :forge_acts, :class_name => 'ForgeActivity',:as =>:forge_act ,:dependent => :destroy
   # end
 
   acts_as_searchable :columns => ['subject', 'content'],
@@ -59,13 +60,12 @@ class Message < ActiveRecord::Base
   validates_length_of :subject, :maximum => 255
   validate :cannot_reply_to_locked_topic, :on => :create
 
-  after_create :add_author_as_watcher, :reset_counters!,:expire_activitie_cache
+  after_create :add_author_as_watcher, :reset_counters!
-  after_update :update_messages_board,:expire_activitie_cache
+  after_update :update_messages_board
-  before_destroy :expire_activitie_cache
   after_destroy :reset_counters!,:down_user_score
   
   # fq
-  after_create :act_as_activity,:be_user_score
+  after_create :act_as_activity,:be_user_score,:act_as_forge_activity
   #before_save :be_user_score
   # end
 
@@ -160,6 +160,14 @@ class Message < ActiveRecord::Base
   end
   # end
 
+  # Time 2015-02-27 14:32:25
+  # Author lizanle
+  # Description 
+  def act_as_forge_activity
+    self.forge_acts << ForgeActivity.new(:user_id => self.author_id,
+                                           :project_id => self.board.project.id)
+  end
+  
   #更新用户分数     -by zjc
   def be_user_score
     #新建message且无parent的为发帖

app/models/news.rb

@@ -17,7 +17,6 @@
 
 class News < ActiveRecord::Base
   include Redmine::SafeAttributes
-  include ExpireHelper
   belongs_to :project
   #added by nwb
   belongs_to :course
@@ -25,7 +24,9 @@ class News < ActiveRecord::Base
   has_many :comments, :as => :commented, :dependent => :delete_all, :order => "created_on"
   # fq
   has_many :acts, :class_name => 'Activity', :as => :act, :dependent => :destroy
-  #end
+  # 被ForgeActivity虚拟关联
+  has_many :forge_acts, :class_name => 'ForgeActivity',:as =>:forge_act ,:dependent => :destroy
+  # end
 
   validates_presence_of :title, :description
   validates_length_of :title, :maximum => 60
@@ -46,11 +47,8 @@ class News < ActiveRecord::Base
 
   after_create :add_author_as_watcher
   # fq
-  after_create :act_as_activity
+  after_create :act_as_activity,:act_as_forge_activity
   # end
-  after_create :expire_activitie_cache
-  after_update :expire_activitie_cache
-  before_destroy :expire_activitie_cache
   
   scope :visible, lambda {|*args|
     includes(:project).where(Project.allowed_to_condition(args.shift || User.current, :view_news, *args))
@@ -96,5 +94,12 @@ class News < ActiveRecord::Base
     self.acts << Activity.new(:user_id => self.author_id)
   end
 
+  # Time 2015-02-27 15:48:17
+  # Author lizanle
+  # Description 公用表中也要记录
+  def act_as_forge_activity
+    self.forge_acts << ForgeActivity.new(:user_id => self.author_id,
+                                         :project_id => self.project.id)
+  end
 
 end

app/models/organization.rb

@@ -0,0 +1,5 @@
+class Organization < ActiveRecord::Base
+  attr_accessible :logo_link, :name
+
+  has_many :projects
+end

app/models/project.rb

@@ -17,7 +17,6 @@
 
 class Project < ActiveRecord::Base
   include Redmine::SafeAttributes
-  include ExpireHelper
   ProjectType_project = 0
   ProjectType_course = 1
 
@@ -90,7 +89,9 @@ class Project < ActiveRecord::Base
                           :association_foreign_key => 'custom_field_id'
                             
   has_many :tags, :through => :project_tags, :class_name => 'Tag'
-  has_many :project_tags, :class_name => 'ProjectTags' 
+  has_many :project_tags, :class_name => 'ProjectTags'
+
+  belongs_to :organization
 
   # has_many :journals
 
@@ -130,9 +131,8 @@ class Project < ActiveRecord::Base
   #ActiveModel::Dirty 这里有一个changed方法。对任何对象都可以用
   after_save :update_inherited_members, :if => Proc.new {|project| project.inherit_members_changed?}
   # 创建project之后默认创建一个board，之后的board去掉了board的概念
-  after_create :create_board_sync,:expire_project_cache
+  after_create :create_board_sync
-  after_update :expire_project_cache
+  before_destroy :delete_all_members
-  before_destroy :delete_all_members,:expire_project_cache
   def remove_references_before_destroy
     return if self.id.nil?
     Watcher.delete_all ['watchable_id = ?', id]

app/models/tracker.rb

@@ -16,7 +16,9 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class Tracker < ActiveRecord::Base
-
+  # Time 2015-02-6 09:34:44
+  # Author lizanle
+  # Description freeze方法让字符串不可变
   CORE_FIELDS_UNDISABLABLE = %w(project_id tracker_id subject description priority_id is_private).freeze
   # Fields that can be disabled
   # Other (future) fields should be appended, not inserted!

app/services/comment_service.rb

@@ -78,4 +78,13 @@ class CommentService
     @jfm
   end
 
+  #发贴，用于意见反馈
+  def create_feedback params,current_user
+    @memo = Memo.new(params[:memo])
+    @memo.forum_id = "1"
+    @memo.author_id = current_user.id
+    @memo.save
+    @memo
+  end
+
 end

app/services/homework_service.rb

@@ -26,8 +26,9 @@ class HomeworkService
     state = @bid.comment_status
     #end
     open_anonymous_evaluation = @bid.open_anonymous_evaluation
+    jours = @bid.journals_for_messages.where('m_parent_id IS NULL').order('created_on DESC')
     {:course_name => course.name,:course_id => course.id,:id => @bid.id, :author => @bid.author,:author_real_name =>author,  :homework_times => many_times, :homework_name => name, :homework_count => homework_count,:student_questions_count => student_questions_count,
-     :description => description, :homework_state => state,:open_anonymous_evaluation => open_anonymous_evaluation,:created_on => @bid.created_on,:deadline => @bid.deadline}
+     :description => description, :homework_state => state,:open_anonymous_evaluation => open_anonymous_evaluation,:created_on => @bid.created_on,:deadline => @bid.deadline,:jours => jours}
   end
   
   # 启动作业匿评前提示信息
@@ -116,7 +117,7 @@ class HomeworkService
       @is_anonymous_comments = @bid.comment_status == 1 && !@homework.users.include?(current_user) && @homework.user != current_user && !@is_teacher #判断是不是匿评(开启匿评，当前用户不是作业的创建者或者参与者，不是老师)
       jours = @homework.journals_for_messages.where("is_comprehensive_evaluation = 3 or is_comprehensive_evaluation is null").order("created_on DESC")#jours留言 is null条件用以兼容历史数据
       #@jour = paginateHelper jours,5 #留言
-      #@cur_page = params[:cur_page] || 1
+      @cur_page = params[:cur_page] || 1
       @cur_type = params[:cur_type] || 5
       teacher_stars_json_like = stars_to_json_like(@teacher_stars,true,@homework,true)
       student_stars_json_like = stars_to_json_like(@student_stars,false,@homework,(false || @is_teacher))
@@ -125,7 +126,7 @@ class HomeworkService
     end
 
     [@homework,{:is_teacher => @is_teacher,:m_score => @m_score,:jours => jours,:teacher_stars => teacher_stars_json_like,
-     :student_stars => student_stars_json_like,:is_anonymous_comments => @is_anonymous_comments,:cur_type => @cur_type}]
+     :student_stars => student_stars_json_like,:is_anonymous_comments => @is_anonymous_comments,:cur_type => @cur_type,:cur_page => @cur_page}]
     #name  = @homework.name
     #desc = @homework.description
     #datetime = @homework.created_at

app/services/watches_service.rb

@@ -1,7 +1,12 @@
+#coding=utf-8
 class WatchesService
   def watch params
     @current_user = User.find(params[:current_user_id])
+    if params[:object_type] == 'user' && params[:current_user_id] == params[:object_id]
+       raise '不能关注自己！'
+    end
     @watchables = find_watchables params
+
     if @watchables.nil?
       raise '404'
     end

app/views/admin/organization.html.erb

@@ -0,0 +1,43 @@
+<div class="contextual">
+  <%= link_to l(:label_organization_new), new_organization_path, :class => 'icon icon-add' %>
+</div>
+
+<h3>
+  <%=l(:label_organization_list)%>
+</h3>
+
+<div class="autoscroll">
+  <table class="list" style="width: 100%;table-layout: fixed">
+    <thead>
+        <tr>
+          <th>
+            <%=l(:label_organization)%>
+          </th>
+          <th>
+            <%=l(:field_created_on)%>
+          </th>
+          <th></th>
+        </tr>
+    </thead>
+    <tbody>
+    <% @organizations.each do |org|%>
+        <tr class="<%= cycle("odd", "even") %>">
+          <td style="text-align:center;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name" title='<%=org.name%>'>
+            <span>
+              <%= link_to org.name,home_path(:organization => org.id) %>
+            </span>
+          </td>
+          <td align="center">
+            <%= format_date(org.created_at) %>
+          </td>
+          <td class="buttons">
+            <%= link_to(l(:button_change), edit_organization_path(org.id), :class => 'icon icon-copy') %>
+            <%= link_to(l(:button_delete),  organization_path(org.id), :method => :delete,:confirm => l(:text_are_you_sure), :class => 'icon icon-del') %>
+          </td>
+        </tr>
+    <% end%>
+    </tbody>
+  </table>
+</div>
+
+<% html_title(l(:label_project_plural)) -%>

app/views/admin/projects.html.erb

@@ -2,16 +2,25 @@
 <%= link_to l(:label_project_new), {:controller => 'projects', :action => 'new'}, :class => 'icon icon-add' %>
 </div>
 
-<h3><%=l(:label_project_plural)%></h3>
+<h3>
+  <%=l(:label_project_plural)%>
+</h3>
 
 <%= form_tag({}, :method => :get) do %>
-<fieldset><legend><%= l(:label_filter_plural) %></legend>
+<fieldset>
-<label for='status'><%= l(:field_status) %> :</label>
+    <legend>
-<%= select_tag 'status', project_status_options_for_select(@status), :class => "small", :onchange => "this.form.submit(); return false;"  %>
+        <%= l(:label_filter_plural) %>
-<label for='name'><%= l(:label_project) %>:</label>
+    </legend>
-<%= text_field_tag 'name', params[:name], :size => 30 %>
+    <label for='status'>
-<%= submit_tag l(:button_apply), :class => "small", :name => nil %>
+      <%= l(:field_status) %> :
-<%= link_to l(:button_clear), {:controller => 'admin', :action => 'projects'}, :class => 'icon icon-reload' %>
+    </label>
+    <%= select_tag 'status', project_status_options_for_select(@status), :class => "small", :onchange => "this.form.submit(); return false;"  %>
+    <label for='name'>
+      <%= l(:label_project) %>:
+    </label>
+    <%= text_field_tag 'name', params[:name], :size => 30 %>
+    <%= submit_tag l(:button_apply), :class => "small", :name => nil %>
+    <%= link_to l(:button_clear), {:controller => 'admin', :action => 'projects'}, :class => 'icon icon-reload' %>
 </fieldset>
 <% end %>
 &nbsp;
@@ -19,17 +28,31 @@
 <div class="autoscroll">
 <table class="list" style="width: 100%;table-layout: fixed">
   <thead><tr>
-  <th><%=l(:label_project)%></th>
+  <th>
-  <th><%=l(:field_is_public)%></th>
+    <%=l(:label_project)%>
-  <th><%=l(:field_created_on)%></th>
+  </th>
+  <th>
+    <%=l(:field_is_public)%>
+  </th>
+  <th>
+    <%=l(:field_created_on)%>
+  </th>
   <th></th>
   </tr></thead>
   <tbody>
 <% project_tree(@projects) do |project, level| %>
   <tr class="<%= cycle("odd", "even") %> <%= project.css_classes %> <%= level > 0 ? "idnt idnt-#{level}" : nil %>">
-  <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name" title='<%=project.name%>'><span><%= link_to_project_settings(project, {}) %></span></td>
+  <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name" title='<%=project.name%>'>
-  <td align="center"><%= checked_image project.is_public? %></td>
+    <span>
-  <td align="center"><%= format_date(project.created_on) %></td>
+      <%= link_to_project_settings(project, {}) %>
+    </span>
+  </td>
+  <td align="center">
+    <%= checked_image project.is_public? %>
+  </td>
+  <td align="center">
+    <%= format_date(project.created_on) %>
+  </td>
   <td class="buttons">
     <%= link_to(l(:button_archive), { :controller => 'projects', :action => 'archive', :id => project, :status => params[:status] }, :data => {:confirm => l(:text_are_you_sure)}, :method => :post, :class => 'icon icon-lock') unless project.archived? %>
     <%= link_to(l(:button_unarchive), { :controller => 'projects', :action => 'unarchive', :id => project, :status => params[:status] }, :method => :post, :class => 'icon icon-unlock') if project.archived? && (project.parent.nil? || !project.parent.archived?) %>

app/views/attachments/_form.html.erb

@@ -27,6 +27,7 @@
 //        file.click();
 //    }
 </script>
+<% project = project %>
 <span class="add_attachment" style="font-weight:normal;">
     <%#= button_tag "浏览", :type=>"button", :onclick=>"CompatibleSend();" %>
     <!--%= link_to image_tag(),"javascript:void(0)", :onclick => "_file.click()"%-->
@@ -41,7 +42,7 @@
             :max_file_size => Setting.attachment_max_size.to_i.kilobytes,
             :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)),
             :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i,
-            :upload_path => uploads_path(:format => 'js'),
+            :upload_path => uploads_path(:format => 'js',:project =>project),
             :description_placeholder => l(:label_optional_description)
           } %>
     <span id="upload_file_count">

app/views/files/_new.html.erb

@@ -38,7 +38,7 @@
 
   </p>
 
-<p><%=l(:label_attachment_plural)%></label><%= render :partial => 'attachments/form' %></p>
+<p><%=l(:label_attachment_plural)%></label><%= render :partial => 'attachments/form', locals: {project: project} %></p>
 </div>
 <%= submit_tag l(:button_add) %>
 <% end %>

app/views/issues/show.html.erb

@@ -1,6 +1,5 @@
 <%# html_title "#{@issue.tracker.name} ##{@issue.id}: #{@issue.subject}" %>
-
+<% html_title "#{@issue.tracker.name} #{@issue.source_from}'#'#{@issue.project_index}: #{@issue.subject}" %>
-<% html_title "#{@issue.tracker.name} #{@issue.source_from}: #{@issue.subject}" %>
 
 <%= render :partial => 'action_menu' %>
 
@@ -87,7 +86,7 @@ end %>
 <%= render_custom_fields_rows(@issue) %>
 <%= call_hook(:view_issues_show_details_bottom, :issue => @issue) %>
 </table>
-
+woca
 <% if @issue.description? || @issue.attachments.any? -%>
 <hr />
 <% if @issue.description? %>

app/views/kaminari/_paginator.html.erb

@@ -7,7 +7,7 @@
     paginator:     the paginator that renders the pagination tags inside
 -%>
 <%= paginator.render do -%>
-  <div class="pagination">
+  <div id="paginator" class="pagination">
     <%= first_page_tag unless current_page.first? %>
     <%= prev_page_tag unless current_page.first? %>
     <% each_page do |page| -%>

app/views/layouts/_base_footer.html.erb

@@ -40,18 +40,15 @@
 </div>
 <div class="debug">
   <%= debug(params) if Rails.env.development? %>
-  <div class="hidden">
+  <script>
-    <script>
+      var _hmt = _hmt || [];
-
+      (function() {
-    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+          var hm = document.createElement("script");
-      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+          hm.src = "//hm.baidu.com/hm.js?67e9738474be83f55f1233001a6ac34e";
-      m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+          var s = document.getElementsByTagName("script")[0];
-    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+          s.parentNode.insertBefore(hm, s);
-
+      })();
-    ga('create', 'UA-46523987-1', 'trustie.net');
+  </script>
-    ga('send', 'pageview');
+</div>
-
-    </script>
-  </div>
 </div>
 

app/views/layouts/base_projects.html.erb

@@ -104,10 +104,9 @@
                                                 <% if @project.project_type == 0 && project_score != 0 %>
                                                     <%= l(:label_project_grade)%> :
                                                     <%= link_to(project_score,  {:controller => 'projects',
-                                                                                                                   :action => 'show_projects_score',
+                                                           :action => 'show_projects_score',
-                                                                                                                   :remote => true,
+                                                           :remote => true,
-                                                                                                                   :id => @project.id
+                                                           :id => @project.id}, :style => "color: #EC6300;")%>
-                                                    }, :style => "color: #EC6300;")%>
                                                 <% end %>
                                                 <!-- end -->
                                               </div>

app/views/organization/_form.html.erb

@@ -0,0 +1,21 @@
+<%= error_messages_for 'project' %>
+<!--[form:project]-->
+<% unless @organizations.new_record? %>
+    <p>
+      <%= render :partial=>"avatar/avatar_form",:locals=> {source:@organizations} %>
+    </p>
+<% end %>
+<p>
+  <label for="project_description">
+    <%= l(:label_organization_name)%>：
+    <span class="required">&nbsp;&nbsp;</span>
+  </label>
+  <%= f.text_field :name, :required => true, :size => 60, :style => "width:290px;" %>
+</p>
+<!--<p>-->
+  <!--<label for="project_description">-->
+    <%#= l(:field_description)%>
+    <!--<span class="required">&nbsp;&nbsp;</span>-->
+  <!--</label>-->
+  <!--<%#= f.text_area :description, :required => true, :size => 60, :style => "width:490px;" %>-->
+<!--</p>-->

app/views/organization/edit.html.erb

@@ -0,0 +1,25 @@
+<%= form_for(@organization) do |f|%>
+    <h3>
+      <%=l(:label_organization_edit)%>
+    </h3>
+    <div class="box tabular" >
+      <%= error_messages_for 'project' %>
+      <p>
+        <%= render :partial=>"avatar/avatar_form",:locals=> {source:@organization} %>
+      </p>
+      <p>
+        <label for="project_description">
+          <%= l(:label_organization_name)%>：
+          <span class="required">&nbsp;&nbsp;</span>
+        </label>
+        <%= f.text_field :name, :required => true, :size => 60, :style => "width:290px;" %>
+      </p>
+      <span style="padding-left: 60px">
+        <%= submit_tag l(:button_create), :class => "enterprise"%>
+      </span>
+    </div>
+    <%#= submit_tag l(:button_create_and_continue), :name => 'continue' %>
+    <%= javascript_tag "$('#project_name').focus();" %>
+<% end %>
+
+<% html_title(l(:label_organization_edit)) -%>

app/views/organization/index.html.erb

@@ -0,0 +1,31 @@
+<title>
+  <%= l(:label_all_enterprises) %>
+</title>
+<div class="content_syqy">
+	<div class="list">
+      <%= l(:label_all_enterprises) %>
+    </div>
+    <div class="syqy_box">
+    	<% if @organizations.empty? %>
+			<h3>
+              <%= l(:label_enterprise_nil)  %>
+            </h3>
+		<% else %>
+			<% @organizations.each do |organization| %>
+				<% unless organization.name.blank? %>
+                    <ul>
+                        <li >
+                          <img src="/images/organization_logo.jpg" width="30" height="30" alt="<%= organization.name%>" />
+                          <%= link_to organization.name,  home_path(:organization => organization.id) %>
+                        </li>
+                    </ul>
+        		<% end %>
+        	<% end %>
+        <% end %>
+    </div>
+</div>
+<div style="clear: both"></div>
+<div class="school-index">
+	<ul id="schoollist" style="line-height: 25px"></ul>
+</div>
+<% html_title(l(:label_enterprise_all)) -%>

app/views/organization/new.html.erb

@@ -0,0 +1,18 @@
+<%= form_for(@organizations, :method => :post,
+                 :name => 'new_form',
+                 :url => {:controller => 'organization',
+                          :action => 'create'}) do |f|%>
+    <h3>
+      <%=l(:label_organization_new)%>
+    </h3>
+    <div class="box tabular" >
+      <%= render :partial => 'form', :locals => { :f => f } %>
+      <span style="padding-left: 60px">
+        <%= submit_tag l(:button_create), :class => "enterprise"%>
+      </span>
+    </div>
+    <%#= submit_tag l(:button_create_and_continue), :name => 'continue' %>
+    <%= javascript_tag "$('#project_name').focus();" %>
+<% end %>
+
+<% html_title(l(:label_organization_new)) -%>

app/views/organizations/index.html.erb

@@ -1,23 +0,0 @@
-<title><%= l(:label_all_enterprises) %></title>
-<div class="content_syqy">
-	<div class="list"><%= l(:label_all_enterprises) %></div>
-    <div class="syqy_box">
-    	<% if @projects.count == 0 %>
-			<h3><%= l(:label_enterprise_nil)  %></h3>
-		<% else %>
-			<% @projects.each do |organization| %>
-				<% unless organization.enterprise_name.blank? %>
-    	<ul>
-        	<li ><img src="/images/organization_logo.jpg" width="30" height="30" alt="#{project.enterprise_name}" />
-        		<%= link_to organization.enterprise_name,  home_path(:organization => organization) %></li>            
-        </ul>
-        		<% end %>
-        	<% end %>
-        <% end %>
-    </div>
-</div>
-<div style="clear: both"></div>
-<div class="school-index">
-	<ul id="schoollist" style="line-height: 25px"></ul>
-</div>
-<% html_title(l(:label_enterprise_all)) -%>

app/views/projects/_form.html.erb

@@ -1,35 +1,62 @@
 <%= error_messages_for 'project' %>
 <!--[form:project]-->
 <% unless @project.new_record? %>
-<p><%= render :partial=>"avatar/avatar_form",:locals=> {source:@project} %></p>
+<p>
+  <%= render :partial=>"avatar/avatar_form",:locals=> {source:@project} %>
+</p>
 <% end %>
-<p><%= f.text_field :name, :required => true, :size => 60, :style => "width:490px;" %></p>
+<p>
+  <%= f.text_field :name, :required => true, :size => 60, :style => "width:490px;" %>
+</p>
 
 <p style="padding-right: 20px;">
   <%= f.text_area :description, :rows => 8, :class => 'wiki-edit', :style => "font-size:small;width:490px;margin-left:10px;" %>
 </p><!--by young-->
-<p><%= f.text_field :enterprise_name, :size => 60, :style => "width:490px;" %></p>
+<p>
-<p style="display: none" ><%= f.text_field :identifier, :required => true, :size => 60, :style => "width:488px;", :disabled => @project.identifier_frozen?, :maxlength => Project::IDENTIFIER_MAX_LENGTH,
+  <%#= f.text_field :enterprise_name, :size => 60, :style => "width:490px;" %>
+  <label for="project_description">
+    <%= l(:field_enterprise_name)%>
+    <span class="required">&nbsp;&nbsp;</span>
+  </label>
+  <%= select_tag :organization_id,options_for_select(project_organizations_id_option,@project.organization_id),{}  %>
+</p>
+<p style="display: none" >
+  <%= f.text_field :identifier, :required => true, :size => 60, :style => "width:488px;", :disabled => @project.identifier_frozen?, :maxlength => Project::IDENTIFIER_MAX_LENGTH,
                                           value:"#{User.current.id.to_s + '_' +Time.now.to_s.gsub(' ','_').gsub(':','').gsub('+','')}" %>
 <% unless @project.identifier_frozen? %>
-  <em class="info"><%= l(:text_length_between, :min => 1, :max => Project::IDENTIFIER_MAX_LENGTH) %> <%= l(:text_project_identifier_info).html_safe %></em>
+  <em class="info">
+    <%= l(:text_length_between, :min => 1, :max => Project::IDENTIFIER_MAX_LENGTH) %>
+    <%= l(:text_project_identifier_info).html_safe %>
+  </em>
 <% end %></p>
 
 <!-- <p style="margin-left:-10px;"><%#= f.text_field :homepage, :size => 60, :style => "width:488px;margin-left: 10px;" %></p> -->  <!-- by huang -->
-<p style="margin-left:-10px;"><em style ="color: #888888;display: block;font-size: 90%;font-style: normal;"><%= f.check_box :is_public, :style => "margin-left:10px;" %></em></p>
+<p style="margin-left:-10px;">
-<p style="margin-left:-10px;"><em style ="color: #888888;display: block;font-size: 90%;font-style: normal;"><%= f.check_box :hidden_repo, :style => "margin-left:10px;" %></em></p>
+  <em style ="color: #888888;display: block;font-size: 90%;font-style: normal;">
+    <%= f.check_box :is_public, :style => "margin-left:10px;" %>
+  </em>
+</p>
+<p style="margin-left:-10px;">
+  <em style ="color: #888888;display: block;font-size: 90%;font-style: normal;">
+    <%= f.check_box :hidden_repo, :style => "margin-left:10px;" %>
+  </em>
+</p>
 <!--
 <p style="margin-left:-10px;"><em style ="color: #888888;display: block;font-size: 90%;font-style: normal;">
   <%#= f.check_box :dts_test, :style => "margin-left:10px;" %>
 </em></p>
 -->
-<p style="display:none;"><%= f.text_field :project_type, :value => 0 %></p>
+<p style="display:none;">
+  <%= f.text_field :project_type, :value => 0 %>
+</p>
 
 <%= wikitoolbar_for 'project_description' %>
 
 
 <% @project.custom_field_values.each do |value| %>
-  <p><%= custom_field_tag_with_label :project, value %></p>
+  <p>
+    <%= custom_field_tag_with_label :project, value %>
+  </p>
 <% end %>
 <%= call_hook(:view_projects_form, :project => @project, :form => f) %>
 

app/views/projects/new.html.erb

@@ -4,7 +4,9 @@
 <%= labelled_form_for @project do |f| %>
   <h3><%=l(:label_project_new)%></h3>
   <div class="box tabular" >
-    <p style="font-weight: bold; color: rgb(237,137,36)"> <%=raw l(:label_project_new_description)%> </p>
+    <p style="font-weight: bold; color: rgb(237,137,36)">
+      <%=raw l(:label_project_new_description)%>
+    </p>
     <%= render :partial => 'form', :locals => { :f => f } %>
     <span style="padding-left: 60px">
     <%= submit_tag l(:button_create), :class => "enterprise"%>

app/views/projects/show.html.erb

@@ -1,104 +1,177 @@
-<% if @events_by_day.size >0 %>
+<%= javascript_include_tag "jquery.infinitescroll.js" %>
-    <div class="content-title-top-avtive">
+<script>
-      <p class="subtitle">
+   /* $(document).ready(function (){               //别忘了加这句，除非你没学Jquery
-        <% # 暂时隐藏时间的显示%>
+        $("#container").infinitescroll({
-        <%#= l(:label_date_from_to, :start => format_date(@date_to - @days), :end => format_date(@date_to-1)) %>
+            navSelector: "#paginator",     //页面分页元素--成功后自动隐藏
-      </p>
+            nextSelector: "#paginator a[rel='next']", //下一页的按钮，但是貌似这个选不中
-
+            itemSelector: ".scroll " ,
-      <% @events_by_day.keys.sort.reverse.each do |day| %>
+            path: function(current){   var page = parseInt(current)+1;
-          <% sort_activity_events(@events_by_day[day]).each do |e, in_group| -%>
+                                        var project_id = <%= @project.id %>;
-              <div class="activity-item underline-evreycontent" style="font-size: 14px;line-height:1.5em;width: 100%;word-wrap: break-word;word-break: break-all;">
+                                        return "/projects/"+project_id+"?page="+page
-                <div class="activity-avatar" style="float: left; margin:3px; height: 100%;">
+                                    },  //下一页的路径
-                  <%= image_tag(url_to_avatar(e.event_author), :class => "avatar") %>
+            animate: true,
-                </div>
+            maxPage: 500
-                <div class="activity-content" style="padding:5px 5px 5px 70px;">
+        });
-                  <strong> <%= h(e.project) if @project.nil? || @project.id != e.project.id %></strong>
+    });*/
-                    <span class="activity-title font_lighter">
+</script>
-                      <% if @canShowRealName %>
+<div id="container">
-                      <%= link_to_user(e.event_author) if e.respond_to?(:event_author) %>
+  <div class="scroll">
-                          (<%= link_to_user(e.event_author, @canShowRealName) if e.respond_to?(:event_author) %>)
+    <% unless @events_pages.empty? %>
-                      <% else %>
+    <% @events_pages.each do |e| -%>
-                      <%= link_to_user(e.event_author) if e.respond_to?(:event_author) %>
+      <% act = e.forge_act %>
-                      <% end %>
+      <% if e.forge_act_type == "Issue" %>
-                      <%= l(:label_new_activity) %>
+      <div class="activity-item underline-evreycontent" style="font-size: 14px;line-height:1.5em;width: 100%;word-wrap: break-word;word-break: break-all;">
-                    </span>
+        <div class="activity-avatar" style="float: left; margin:3px; height: 100%;">
-                  <%= link_to "#{eventToLanguageCourse(e.event_type, @project)}: "<< format_activity_title(e.event_title), (e.event_type.eql?("attachment")&&e.container.kind_of?(Project)) ? project_files_path(e.container) : e.event_url %>
+          <%= image_tag(url_to_avatar(act.author), :class => "avatar") %>
+        </div>
 
-                  <div class="activity_description info-break" style="font-size: 13px;width: 100%;word-break: break-all;word-wrap: break-word;">
+        <div class="activity-content" style="padding:5px 5px 5px 70px;">
-                    <%= textAreailizable e,:event_description %>
+          <strong> <%= h(e.project) if @project.nil? || @project.id != e.project_id %></strong>
-                    <%#= h(truncate(strip_tags(e.event_description).gsub(/&nbsp;/, ' '), length: 30, omission: '...')) %>
+                <span class="activity-title font_lighter">
-                  </div>
+                  <%= link_to_user(act.author)  %>
-                  <div class="activity_status" style="position:relative; padding-top: 3px;">
+                  <%= l(:label_new_activity) %>
-                    <span class="font_lighter"> <%= l :label_activity_time %>
+                </span>
-                      ：&nbsp; <%= format_activity_day(day) %> <%= format_time(e.event_datetime, false) %></span>
+          <%= link_to format_activity_title("#{act.source_from}##{act.project_issues_index} (#{act.status}): #{act.tracker.name} #{act.subject}"),
-                    <% if e.event_type == "issue" %>
+                      {:controller => 'issues',
-                        <div class="" style="display:inline-block;position:absolute; right:2%;">
+                       :action => 'show',
-                          <span> <%= link_to l(:label_find_all_comments), issue_path(e) %> </span><span class="font_lighter"><%= l(:label_comments_count, :count => e.journals.count) %></span>
+                       :id => act.id} %>
-                        </div>
+          <div class="activity_description info-break" style="font-size: 13px;width: 100%;word-break: break-all;word-wrap: break-word;">
-                    <% end %>
+            <%= textAreailizable act,:description %>
-                  </div>
+          </div>
+          <div class="activity_status" style="position:relative; padding-top: 3px;">
+                <span class="font_lighter"> <%= l :label_activity_time %>
+                  ：&nbsp; <%= format_activity_day(act.created_on) %> <%= format_time(act.created_on, false) %></span>
+                <div class="" style="display:inline-block;position:absolute; right:2%;">
+                  <span> <%= link_to l(:label_find_all_comments), issue_path(act.id) %> </span><span class="font_lighter"><%= l(:label_comments_count, :count => act.journals.count) %></span>
                 </div>
-              </div>
+          </div>
+        </div>
+      </div>
+      <% elsif e.forge_act_type == "Journal" %>
+        <div class="activity-item underline-evreycontent" style="font-size: 14px;line-height:1.5em;width: 100%;word-wrap: break-word;word-break: break-all;">
+          <div class="activity-avatar" style="float: left; margin:3px; height: 100%;">
+            <%= image_tag(url_to_avatar(e.user), :class => "avatar") %>
+          </div>
 
-          <% end %>
+          <div class="activity-content" style="padding:5px 5px 5px 70px;">
-      <% end -%>
+            <strong> <%= h(e.project) if @project.nil? || @project.id != e.project_id %></strong>
-      <% if (@events_pages.page == @events_pages.last_page) %>
+        <span class="activity-title font_lighter">
-          <div class="activity-item underline-evreycontent" style="font-size: 14px;line-height:1.5em;">
+           <%= link_to(h(e.user), user_path(e.user_id)) %>
-            <div class="activity-avatar" style="float: left; margin:3px; height: 100%;">
+          <%= l(:label_new_activity) %>
-              <%= image_tag(url_to_avatar(@user), :class => "avatar") %>
+        </span>
+            <%= link_to(l(:label_activity_project)+act.issue.project.name, project_path(act.issue.project.id)) %>
+            <%= link_to format_activity_title("#{act.issue.tracker} ##{act.issue.project_issues_index}: #{act.issue.subject}"),
+                        {:controller => 'issues', :action => 'show', :id => act.issue.id, :anchor => "change-#{act.id}"} %>
+            <div class="activity_description info-break" style="font-size: 13px;width: 100%;word-break: break-all;word-wrap: break-word;">
+              <%= textAreailizable act,:notes %>
             </div>
-            <div class="activity-content" style="padding:5px 5px 5px 70px;">
+            <div class="activity_status" style="position:relative; padding-top: 3px;">
-      <span class="activity-title font_lighter">
+                <span class="font_lighter"> <%= l :label_activity_time %>
-              <% if @canShowRealName %>
+                ：&nbsp; <%= format_activity_day(act.created_on) %> <%= format_time(act.created_on, false) %></span>
-                  (<%= link_to_user(@user, @canShowRealName) %>
-            )
-              <% else %>
-                  <%= link_to_user(@user) %>
-              <% end %>
-        <%#= l(:label_new_activity) %>
-      </span>
-              <%= l(:label_user_create_project) %> <%= link_to @project.name %>
-              <strong> !</strong>
-              <div class="activity_description info-break" style="font-size: 13px;">
-              </div>
-              <div class="activity_status" style="position:relative; padding-top: 3px;">
-                <span class="font_lighter"><%= l :label_activity_time %>: <%= format_time(@project.created_on) %></span>
-              </div>
             </div>
           </div>
-      <% end %>
-    </div>
-<% else %>
-    <div class="activity-item underline-evreycontent" style="font-size: 14px;line-height:1.5em;">
-      <div class="activity-avatar" style="float: left; margin:3px; height: 100%;">
-        <%= image_tag(url_to_avatar(@user), :class => "avatar") %>
-      </div>
-      <div class="activity-content" style="padding:5px 5px 5px 70px;">
-      <span class="activity-title font_lighter">
-              <% if @canShowRealName %>
-                  (<%= link_to_user(@user, @canShowRealName) %>
-            )
-              <% else %>
-                  <%= link_to_user(@user) %>
-              <% end %>
-        <%#= l(:label_new_activity) %>
-      </span>
-        <%= l(:label_user_create_project) %> <%= link_to @project.name %>
-        <strong> !</strong>
-        <div class="activity_description info-break" style="font-size: 13px;">
         </div>
-        <div class="activity_status" style="position:relative; padding-top: 3px;">
+        <% elsif e.forge_act_type == "Message" %>
-          <span class="font_lighter"><%= l :label_activity_time %>: <%= format_time(@project.created_on) %></span>
+          <div class="activity-item underline-evreycontent" style="font-size: 14px;line-height:1.5em;width: 100%;word-wrap: break-word;word-break: break-all;">
+              <div class="activity-avatar" style="float: left; margin:3px; height: 100%;">
+                <%= image_tag(url_to_avatar(e.user), :class => "avatar") %>
+              </div>
+              <div class="activity-content" style="padding:5px 5px 5px 70px;">
+              <strong> <%= h(e.project) if @project.nil? || @project.id != e.project_id %></strong>
+        <span class="activity-title font_lighter">
+           <%= link_to(h(e.user), user_path(e.user_id)) %>
+          <%= l(:label_new_activity) %>
+        </span>
+                <%= link_to format_activity_title("#{act.board.name}: #{act.subject}"),
+                            {:controller => 'messages',
+                             :action => 'show',
+                             :board_id => act.board_id}.merge(act.parent_id.nil? ? {:id => act.id} : {:id => act.parent_id, :r => act.id, :anchor => "message-#{act.id}"}) %>
+            <div class="activity_description info-break" style="font-size: 13px;width: 100%;word-break: break-all;word-wrap: break-word;">
+              <%= textAreailizable act,:content %>
+            </div>
+            <div class="activity_status" style="position:relative; padding-top: 3px;">
+        <span class="font_lighter"> <%= l :label_activity_time %>
+          ：&nbsp; <%= format_activity_day(act.created_on) %> <%= format_time(act.created_on, false) %></span>
+            </div>
+          </div>
         </div>
-      </div>
+            <% elsif e.forge_act_type == "News" %>
-    </div>
+                <div class="activity-item underline-evreycontent" style="font-size: 14px;line-height:1.5em;width: 100%;word-wrap: break-word;word-break: break-all;">
-<% end %>
+                  <div class="activity-avatar" style="float: left; margin:3px; height: 100%;">
+                    <%= image_tag(url_to_avatar(e.user), :class => "avatar") %>
+                  </div>
+                  <div class="activity-content" style="padding:5px 5px 5px 70px;">
+                    <strong> <%= h(e.project) if @project.nil? || @project.id != e.project_id %></strong>
+                    <span class="activity-title font_lighter">
+                       <%= link_to(h(e.user), user_path(e.user_id)) %>
+                      <%= l(:label_new_activity) %>
+                    </span>
+                    <%= link_to format_activity_title("#{l(:label_news)}: #{act.title}"), {:controller => 'news', :action => 'show', :id => act.id} %>
+                    <div class="activity_description info-break" style="font-size: 13px;width: 100%;word-break: break-all;word-wrap: break-word;">
+                      <%= textAreailizable act,:description %>
+                    </div>
+                    <div class="activity_status" style="position:relative; padding-top: 3px;">
+                        <span class="font_lighter"> <%= l :label_activity_time %>
+                        ：&nbsp; <%= format_activity_day(act.created_on) %> <%= format_time(act.created_on, false) %></span>
+                      <div class="" style="display:inline-block;position:absolute; right:2%;">
+                      <span>
+                         <%= link_to l(:label_find_all_comments), {:controller => 'news', :action => 'show', :id => act.id} %>
+                       </span>
+                        <span class="font_lighter">
+                          <%= l(:label_comments_count, :count => act.comments_count) %>
+                        </span>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+            <% elsif e.forge_act_type == "Document" %>
+                <div class="activity-item underline-evreycontent" style="font-size: 14px;line-height:1.5em;width: 100%;word-wrap: break-word;word-break: break-all;">
+                  <div class="activity-avatar" style="float: left; margin:3px; height: 100%;">
+                    <%= image_tag(url_to_avatar(e.user), :class => "avatar") %>
+                  </div>
+                  <div class="activity-content" style="padding:5px 5px 5px 70px;">
+                    <strong> <%= h(e.project) if @project.nil? || @project.id != e.project_id %></strong>
+                    <span class="activity-title font_lighter">
+                       <%= link_to(h(e.user), user_path(e.user_id)) %>
+                      <%= l(:label_new_activity) %>
+                    </span>
+                    <%= link_to format_activity_title("#{l(:label_document)}: #{act.title}"), {:controller => 'documents', :action => 'show', :id => act.id} %>
+                    <div class="activity_description info-break" style="font-size: 13px;width: 100%;word-break: break-all;word-wrap: break-word;">
+                      <%= textAreailizable act,:description %>
+                    </div>
+                    <div class="activity_status" style="position:relative; padding-top: 3px;">
+                        <span class="font_lighter"> <%= l :label_activity_time %>
+                          ：&nbsp; <%= format_activity_day(act.created_on) %> <%= format_time(act.created_on, false) %></span>
 
+                    </div>
+                  </div>
+                </div>
+            <% elsif e.forge_act_type == "Attachment" %>
+                <div class="activity-item underline-evreycontent" style="font-size: 14px;line-height:1.5em;width: 100%;word-wrap: break-word;word-break: break-all;">
+                  <div class="activity-avatar" style="float: left; margin:3px; height: 100%;">
+                    <%= image_tag(url_to_avatar(e.user), :class => "avatar") %>
+                  </div>
+                  <div class="activity-content" style="padding:5px 5px 5px 70px;">
+                    <strong> <%= h(e.project) if @project.nil? || @project.id != e.project_id %></strong>
+                    <span class="activity-title font_lighter">
+                       <%= link_to(h(e.user), user_path(e.user_id)) %>
+                      <%= l(:label_new_activity) %>
+                    </span>
+                    <%= link_to format_activity_title("#{l(:label_attachment)}: #{act.filename}"), {:controller => 'attachments', :action => 'show', :id => act.id} %>
+                    <div class="activity_description info-break" style="font-size: 13px;width: 100%;word-break: break-all;word-wrap: break-word;">
+                      <%= textAreailizable act,:description %>
+                    </div>
+                    <div class="activity_status" style="position:relative; padding-top: 3px;">
+                        <span class="font_lighter"> <%= l :label_activity_time %>
+                          ：&nbsp; <%= format_activity_day(act.created_on) %> <%= format_time(act.created_on, false) %></span>
 
-<div class="pagination">
+                    </div>
-  <ul>
+                  </div>
-    <%= pagination_links_full @events_pages %>
+                </div>
-  </ul>
+            <% end %>
+    <% end %>
+    <% end %>
+  </div>
 </div>
-<% html_title(l(:label_overview)) -%>
 
+<%= paginate @events_pages %>

app/views/welcome/_hot_projects_list.html.erb

@@ -5,7 +5,9 @@
 	<!-- 上左下右 -->
 	<div style="float: left; margin-left: 10px; width: 380px;">
 		<% unless project.is_public %>
-		<span class="private_project"> <%= l(:label_private) %> </span>
+		    <span class="private_project">
+              <%= l(:label_private) %>
+            </span>
 		<% end %>
 		<%= link_to( project.name, project_path(project.id), :class => "d-g-blue d-p-project-name",:title => "#{project.name}" )%>
 		(<%= link_to l(:label_project_member_amount, :count=>projectCount(project)), project_member_path(project) ,:course =>'0' %>)

app/views/welcome/index.html.erb

@@ -38,7 +38,7 @@
 					<%= image_tag '/images/transparent.png', width:@first_page.image_width,height: @first_page.image_height %>
 				<% end %>
 			<% else %>
-              <%= image_tag(url_to_avatar(@enterprise_page), width:@first_page.image_width,height: @first_page.image_height) %>
+              <%= image_tag(url_to_avatar(@organization), width:@first_page.image_width,height: @first_page.image_height) %>
 			<% end %>
 		</div>
 		<div class="welcome_left" id="welcome_left">
@@ -47,9 +47,9 @@
 					<%= @first_page.description.html_safe %>
 				<% end %>
 			<% else %>
-            <span class="font_welcome_school" style="color: #E8770D">
+                <span class="font_welcome_school" style="color: #E8770D">
-              <%=  @organization %>
+                  <%=  @organization.name %>
-            </span>
+                </span>
             <br/>
             <span class="font_welcome_trustie">
               <%= @enterprise_page.title %>
@@ -86,24 +86,21 @@
 				<% end; reset_cycle  %>
 			<!-- 企业版项目 -->
 			<% else %>
-				<% if @e_count == 0 %>
+              <% if @part_projects.empty? %>
-					<div id="flash_notice" class="flash notice"><%= l(:label_enterprise_tips) %></div>
+                  <% @projects.map do |project| %>
-					<% @projects.map do |project| %>
+                      <%= render :partial => 'hot_projects_list', :locals => {:project => project} %>
-					<%= render :partial => 'hot_projects_list', :locals => {:project => project} %>
+                  <% end %>
-				<% end %>
+              <% else %>
-				<% elsif @e_count < 10 %>					
+                  <% @organization_projects.map do |project| %>
-					<% @organization_projects.map do |project| %>
+                      <%= render :partial => 'hot_projects_list', :locals => {:project => project} %>
-						<%= render :partial => 'hot_projects_list', :locals => {:project => project} %>
+                  <% end %>
-					<% end %>
+                  <div id="errorExplanation">
-					<div id="flash_notice" class="flash notice"><%= l(:label_part_enterprise_tips) %></div>
+                    <%= l(:label_part_enterprise_tips) %>
-					<% @part_projects.map do |project| %>
+                  </div>
-						<%= render :partial => 'hot_projects_list', :locals => {:project => project} %>
+                  <% @part_projects.map do |project| %>
-					<% end %>
+                      <%= render :partial => 'hot_projects_list', :locals => {:project => project} %>
-				<% else %>
+                  <% end %>
-					<% @part_projects.map do |project| %>
+              <% end %>
-						<%= render :partial => 'hot_projects_list', :locals => {:project => project} %>
-					<% end %>						
-				<% end %>
 			<% end %>
 		</ul>
 	</div>
@@ -117,10 +114,8 @@
               </strong>
             </h3>
 			<div class="user-message-box-list" style="margin-top: 10px;">
-              <% cache("activities") do %>
 				<%activities = find_all_activities%>
                 <% activities.each do |event| %>
-                  <% cache event do %>
                     <li style="display: block;height:60px; padding-bottom: 4px;">
                         <div class="inner-right" style="float: left; height: 100%; ">
                             <%= image_tag url_to_avatar(event.event_author), :class => "avatar-3" %>
@@ -145,25 +140,20 @@
                         </div>
                     </li>
                   <% end  %>
-                <% end  %>
-               <% end %>
 			</div>
 		</ul>
 	</div>
 
 <div class="right" style="float: right; width: 48%; ">
 	<ul class="welcome-message-list">
-		<!--<%# cache 'forum_links' do %> -->
 		<div class="forum-topic" style="height: 25px; width: 98%; margin-left: 2px;">
 			<h3 style="color: rgb(21, 188, 207);"><strong> <%= l(:lable_bar_active)%> </strong> <%= link_to l(:label_my_question) , newbie_send_path, {:class => 'orangeButton idea_btn', :style => "color: #EEEEEE" }%>
 			<%= link_to l(:label_my_feedback) , suggestion_send_path, {:class => 'orangeButton idea_btn', :style => "color: #EEEEEE" }%> </h3>
 			<span style="margin-top: -30px;float: right; display: block;"> <%= link_to l(:label_more), forums_path %> </span>
 		</div>
 		<div class="welcome-box-list-new memo_activity">
-          <% cache("forums") do %>
 			<% topics = find_new_forum_topics(6) %>
 		    <% topics.includes(:forum, :last_reply, :author).each do |topic|%>
-              <% cache topic do %>
                 <li class="message-brief-intro" style="line-height:1.4em;">
                     <div class='memo_title text_nowrap'>
                       <%= link_to '['+topic.forum.name + ']',forum_path(topic.forum),:class => 'memo_Bar_title' %>
@@ -192,9 +182,6 @@
                     </div>
                 </li>
               <%end %>
-		    <% end %>
-          <% end %>
-        
 		</div>
 	</ul>
 </div>

config/locales/zh.yml

@@ -247,7 +247,7 @@ zh:
   label_course_closed_tips: "确定要%{desc}课程？"
   # end
   field_name: 名称
-  field_enterprise_name: 组织名称
+  field_enterprise_name: 组织
 
   label_week_mail: 一周动态
   label_day_mail: 一日动态
@@ -538,6 +538,11 @@ zh:
   label_project: 项目
   label_activity_project: '项目: '  #added by bai
 
+  label_organization: 组织
+  label_organization_name: 组织名称
+  label_organization_list: 组织列表
+  label_organization_new: 新建组织
+  label_organization_edit: 修改组织
   label_project_plural: 项目列表
   label_first_page_made: 首页定制
   label_project_first_page: 项目托管平台首页

config/routes.rb

@@ -26,9 +26,6 @@
 # Example: :via =>  :get ====> :via => :get
 
 RedmineApp::Application.routes.draw do
-  get "organizations/index"
-
-  #match '/contests/:id/contestnotifications', :controller => 'contestnotifications', :action => 'index'
 
   mount Mobile::API => '/api'
 
@@ -39,6 +36,10 @@ RedmineApp::Application.routes.draw do
   resources :apply_project_masters
   delete 'apply_project_masters', :to => 'apply_project_masters#delete'
 
+  resources :organization, :except => [:show] do
+
+  end
+
   resources :homework_attach do
     collection do
       get 'get_homework_member_list'
@@ -390,7 +391,6 @@ RedmineApp::Application.routes.draw do
     match '/statistics', :to => 'projects#statistics',  :as => 'statistics', :via => :get
     #   match '/investor', :controller => 'projects', :action => 'investor',  :as => 'investor', :via => :get
     match '/homework', :to => 'projects#homework', :as => 'homework', :via => :get
-    match 'organizations', :to => 'organizations#index', :as => 'index', :via => :get
     
     #   match '/activity', :controller => 'activities', :action => 'index',  :as => 'activity', :via => :get
     #   match '/repository', :controller => 'repositories', :action => 'show', :repository_id => nil, :path => nil, :rev => nil, :as => 'repository', :via => :get
@@ -646,6 +646,7 @@ RedmineApp::Application.routes.draw do
   match 'admin/info',  :via => :get
   match 'admin/test_email',  :via => :get
   match 'admin/default_configuration', :via => :post
+  get 'admin/organization'
 
   resources :auth_sources do
     member do

db/migrate/20150206023634_create_forge_activities.rb

@@ -0,0 +1,13 @@
+class CreateForgeActivities < ActiveRecord::Migration
+  def change
+    create_table :forge_activities do |t|
+      t.integer :user_id
+      t.integer :project_id
+      t.references :forge_act, polymorphic: true, index: true
+      t.integer  :org_id
+      t.timestamps
+    end
+
+    add_index :forge_activities ,:forge_act_id
+  end
+end

db/migrate/20150206060632_import_issue_data_to_forge_activities.rb

@@ -0,0 +1,46 @@
+# Time 2015-02-37 15:03:42
+# Author lizanle
+# Description 将Issue中的数据导入forge_activities表
+class ImportIssueDataToForgeActivities < ActiveRecord::Migration
+  def up
+    issue_arr = select_all("SELECT\n" +
+                                      "	`issues`.`id` AS id,\n" +
+                                      "	`issues`.`project_id` AS project_id,\n" +
+                                      "	`issues`.`author_id` AS author_id,\n" +
+                                      "	`issues`.`created_on` AS created_on,\n" +
+                                      "	`issues`.`updated_on` AS updated_on\n" +
+                                      "FROM\n" +
+                                      "	`issues`\n" +
+                                      "LEFT OUTER JOIN `projects` ON `projects`.`id` = `issues`.`project_id`\n" +
+                                      "LEFT OUTER JOIN `users` ON `users`.`id` = `issues`.`author_id`\n" +
+                                      "AND `users`.`type` IN ('User', 'AnonymousUser')\n" +
+                                      "LEFT OUTER JOIN `trackers` ON `trackers`.`id` = `issues`.`tracker_id`\n" +
+                                      "WHERE\n" +
+                                      "	(\n" +
+                                      "			projects. STATUS <> 9\n" +
+                                      "			AND projects.id IN (\n" +
+                                      "				SELECT\n" +
+                                      "					em.project_id\n" +
+                                      "				FROM\n" +
+                                      "					enabled_modules em\n" +
+                                      "				WHERE\n" +
+                                      "					em. NAME = 'issue_tracking'\n" +
+                                      "		  )\n" +
+                                      "	)");
+    issue_arr.each do |e|
+      ForgeActivity.connection.execute("insert into forge_activities(forge_act_id,
+                                                                  forge_act_type,
+                                                                  project_id,
+                                                                  user_id,
+                                                                  created_at,
+                                                                  updated_at)
+                                     values(#{e["id"]},'#{Issue.to_s}',#{e["project_id"]},#{e["author_id"]},
+                                            '#{e["created_on"].to_s.gsub("+0800","").to_datetime.strftime("%Y-%m-%d %H:%M:%S")}',
+                                            '#{e["updated_on"].to_s.gsub("+0800","").to_datetime.strftime("%Y-%m-%d %H:%M:%S")}')")
+    end
+  end
+
+  def down
+    ForgeActivity.delete_all([" forge_act_type = ?",ForgeActivity::TYPE_OF_ISSUE_ACT])
+  end
+end

db/migrate/20150210062236_add_journal_data_to_forge_activities.rb

@@ -0,0 +1,51 @@
+class AddJournalDataToForgeActivities < ActiveRecord::Migration
+  def up
+    journal_arr = select_all("SELECT\n" +
+                                        "	`journals`.`id` AS id,\n" +
+                                        "	`journals`.`created_on` AS created_on,\n" +
+                                        "	`projects`.`id` AS project_id,\n" +
+                                        "	`issues`.`updated_on` AS updated_on,\n" +
+                                        "	`users`.`id` AS author_id\n" +
+                                        "FROM\n" +
+                                        "	`journals`\n" +
+                                        "LEFT OUTER JOIN `issues` ON `issues`.`id` = `journals`.`journalized_id`\n" +
+                                        "LEFT OUTER JOIN `projects` ON `projects`.`id` = `issues`.`project_id`\n" +
+                                        "LEFT OUTER JOIN `journal_details` ON `journal_details`.`journal_id` = `journals`.`id`\n" +
+                                        "LEFT OUTER JOIN `users` ON `users`.`id` = `journals`.`user_id`\n" +
+                                        "AND `users`.`type` IN ('User', 'AnonymousUser')\n" +
+                                        "WHERE\n" +
+                                        "	(\n" +
+                                        "			projects. STATUS <> 9\n" +
+                                        "			AND projects.id IN (\n" +
+                                        "				SELECT\n" +
+                                        "					em.project_id\n" +
+                                        "				FROM\n" +
+                                        "					enabled_modules em\n" +
+                                        "				WHERE\n" +
+                                        "					em. NAME = 'issue_tracking'\n" +
+                                        "			)\n" +
+                                        "	)\n" +
+                                        "  AND (\n" +
+                                        " 	journals.journalized_type = 'Issue'\n" +
+                                        " 	AND (\n" +
+                                        "		journal_details.prop_key = 'status_id'\n" +
+                                        "		OR journals.notes <> ''\n" +
+                                        " 	)\n" +
+                                        " )");
+    journal_arr.each do |e|
+      ForgeActivity.connection.execute("insert into forge_activities(forge_act_id,
+                                                                  forge_act_type,
+                                                                  project_id,
+                                                                  user_id,
+                                                                  created_at,
+                                                                  updated_at)
+                                     values(#{e["id"]},'#{Journal.to_s}',#{e["project_id"]},#{e["author_id"]},
+                                            '#{e["created_on"].to_s.gsub("+0800","").to_datetime.strftime("%Y-%m-%d %H:%M:%S")}',
+                                            '#{e["updated_on"].to_s.gsub("+0800","").to_datetime.strftime("%Y-%m-%d %H:%M:%S")}')")
+    end
+  end
+
+  def down
+    ForgeActivity.delete_all([" forge_act_type = ?",ForgeActivity::TYPE_OF_JOURNAL_ACT])
+  end
+end

db/migrate/20150227061944_import_message_data_to_forge_activities.rb

@@ -0,0 +1,41 @@
+class ImportMessageDataToForgeActivities < ActiveRecord::Migration
+  def up
+    issue_arr = select_all("SELECT\n" +
+                               "	`messages`.`id` AS id,\n" +
+                               "	`messages`.`author_id` AS author_id,\n" +
+                               "	`projects`.`id` AS project_id,\n" +
+                               "	`messages`.`created_on` AS created_on,\n" +
+                               "  `messages`.`updated_on` AS updated_on\n" +
+                               "FROM\n" +
+                               "	`messages`\n" +
+                               "LEFT OUTER JOIN `boards` ON `boards`.`id` = `messages`.`board_id`\n" +
+                               "LEFT OUTER JOIN `projects` ON `projects`.`id` = `boards`.`project_id`\n" +
+                               "LEFT OUTER JOIN `users` ON `users`.`id` = `messages`.`author_id`\n" +
+                               "AND `users`.`type` IN ('User', 'AnonymousUser')\n" +
+                               "WHERE\n" +
+                               "			projects. STATUS <> 9\n" +
+                               "			AND projects.id IN (\n" +
+                               "				SELECT\n" +
+                               "					em.project_id\n" +
+                               "				FROM\n" +
+                               "					enabled_modules em\n" +
+                               "				WHERE\n" +
+                               "					em. NAME = 'boards'\n" +
+                               ")");
+    issue_arr.each do |e|
+      ForgeActivity.connection.execute("insert into forge_activities(forge_act_id,
+                                                                  forge_act_type,
+                                                                  project_id,
+                                                                  user_id,
+                                                                  created_at,
+                                                                  updated_at)
+                                     values(#{e["id"]},'#{Message.to_s}',#{e["project_id"]},#{e["author_id"]},
+                                            '#{e["created_on"].to_s.gsub("+0800","").to_datetime.strftime("%Y-%m-%d %H:%M:%S")}',
+                                            '#{e["updated_on"].to_s.gsub("+0800","").to_datetime.strftime("%Y-%m-%d %H:%M:%S")}')")
+    end
+  end
+
+  def down
+    ForgeActivity.delete_all([" forge_act_type = ?",ForgeActivity::TYPE_OF_MESSAGE_ACT])
+  end
+end

db/migrate/20150227065713_import_news_data_to_forge_activities.rb

@@ -0,0 +1,41 @@
+class ImportNewsDataToForgeActivities < ActiveRecord::Migration
+  def up
+    issue_arr = select_all("SELECT\n" +
+                               "	`messages`.`id` AS id,\n" +
+                               "	`messages`.`author_id` AS author_id,\n" +
+                               "	`projects`.`id` AS project_id,\n" +
+                               "	`messages`.`created_on` AS created_on,\n" +
+                               "  `messages`.`updated_on` AS updated_on\n" +
+                               "FROM\n" +
+                               "	`messages`\n" +
+                               "LEFT OUTER JOIN `boards` ON `boards`.`id` = `messages`.`board_id`\n" +
+                               "LEFT OUTER JOIN `projects` ON `projects`.`id` = `boards`.`project_id`\n" +
+                               "LEFT OUTER JOIN `users` ON `users`.`id` = `messages`.`author_id`\n" +
+                               "AND `users`.`type` IN ('User', 'AnonymousUser')\n" +
+                               "WHERE\n" +
+                               "			projects. STATUS <> 9\n" +
+                               "			AND projects.id IN (\n" +
+                               "				SELECT\n" +
+                               "					em.project_id\n" +
+                               "				FROM\n" +
+                               "					enabled_modules em\n" +
+                               "				WHERE\n" +
+                               "					em. NAME = 'boards'\n" +
+                               ")");
+    issue_arr.each do |e|
+      ForgeActivity.connection.execute("insert into forge_activities(forge_act_id,
+                                                                  forge_act_type,
+                                                                  project_id,
+                                                                  user_id,
+                                                                  created_at,
+                                                                  updated_at)
+                                     values(#{e["id"]},'#{News.to_s}',#{e["project_id"]},#{e["author_id"]},
+                                            '#{e["created_on"].to_s.gsub("+0800","").to_datetime.strftime("%Y-%m-%d %H:%M:%S")}',
+                                            '#{e["created_on"].to_s.gsub("+0800","").to_datetime.strftime("%Y-%m-%d %H:%M:%S")}')")
+    end
+  end
+
+  def down
+    ForgeActivity.delete_all([" forge_act_type = ?",ForgeActivity::TYPE_OF_NEWS_ACT])
+  end
+end

db/migrate/20150227083257_add_column_project_issue_index_to_issues.rb

@@ -0,0 +1,6 @@
+class AddColumnProjectIssueIndexToIssues < ActiveRecord::Migration
+  def change
+    add_column :issues, :project_issues_index, :integer
+  end
+
+end

db/migrate/20150227085333_add_data_to_project_issues_indexs_in_issue.rb

@@ -0,0 +1,10 @@
+class AddDataToProjectIssuesIndexsInIssue < ActiveRecord::Migration
+  def change
+    for i in 1 ... 1000 do i
+      Issue.page(i).per(10).each do |e|
+        index = e.project.issues.index(e).to_i + 1
+        execute("update issues set project_issues_index = #{index} where id = #{e.id}")
+      end
+    end
+  end
+end

db/migrate/20150302061232_import_document_data_to_forge_activities.rb

@@ -0,0 +1,37 @@
+class ImportDocumentDataToForgeActivities < ActiveRecord::Migration
+  def up
+    doc_arr = select_all("SELECT\n" +
+                             "	`documents`.`id` AS id,\n" +
+                             "	`documents`.`project_id` AS project_id,\n" +
+                             "	`documents`.`created_on` AS created_on,\n" +
+                             "	`documents`.`user_id` AS author_id\n" +
+                             "FROM\n" +
+                             "	`documents`\n" +
+                             "LEFT OUTER JOIN `projects` ON `projects`.`id` = `documents`.`project_id`\n" +
+                             "WHERE\n" +
+                             "			projects. STATUS <> 9\n" +
+                             "			AND projects.id IN (\n" +
+                             "				SELECT\n" +
+                             "					em.project_id\n" +
+                             "				FROM\n" +
+                             "					enabled_modules em\n" +
+                             "				WHERE\n" +
+                             "					em. NAME = 'documents'\n" +
+                             ")");
+    doc_arr.each do |e|
+      ForgeActivity.connection.execute("insert into forge_activities(forge_act_id,
+                                                                  forge_act_type,
+                                                                  project_id,
+                                                                  user_id,
+                                                                  created_at,
+                                                                  updated_at)
+                                     values(#{e["id"]},'#{Document.to_s}',#{e["project_id"]},#{e["author_id"]},
+                                            '#{e["created_on"].to_s.gsub("+0800","").to_datetime.strftime("%Y-%m-%d %H:%M:%S")}',
+                                            '#{e["created_on"].to_s.gsub("+0800","").to_datetime.strftime("%Y-%m-%d %H:%M:%S")}')")
+    end
+  end
+
+  def down
+    ForgeActivity.delete_all([" forge_act_type = ?",ForgeActivity::TYPE_OF_DOCUMENT_ACT])
+  end
+end

db/migrate/20150302091345_import_attachments_data_to_forge_activities.rb

@@ -0,0 +1,43 @@
+class ImportAttachmentsDataToForgeActivities < ActiveRecord::Migration
+  def up
+  attach_arr = select_all("SELECT\n" +
+                           "  attachments.author_id as author_id,\n" +
+                           "	attachments.created_on as created_on,\n" +
+                           "	attachments.id as id,\n" +
+                           "	projects.id as project_id\n" +
+                           "FROM\n" +
+                           "	`attachments`\n" +
+                           "LEFT JOIN versions ON attachments.container_type = 'Version'\n" +
+                           "AND versions.id = attachments.container_id\n" +
+                           "LEFT JOIN projects ON versions.project_id = projects.id\n" +
+                           "OR (\n" +
+                           "	attachments.container_type = 'Project'\n" +
+                           "	AND attachments.container_id = projects.id\n" +
+                           ")\n" +
+                           "WHERE\n" +
+                           "			projects. STATUS <> 9\n" +
+                           "			AND projects.id IN (\n" +
+                           "				SELECT\n" +
+                           "					em.project_id\n" +
+                           "				FROM\n" +
+                           "					enabled_modules em\n" +
+                           "				WHERE\n" +
+                           "					em. NAME = 'files'\n" +
+                           "			)");
+  attach_arr.each do |e|
+    ForgeActivity.connection.execute("insert into forge_activities(forge_act_id,
+                                                                  forge_act_type,
+                                                                  project_id,
+                                                                  user_id,
+                                                                  created_at,
+                                                                  updated_at)
+                                     values(#{e["id"]},'#{Attachment.to_s}',#{e["project_id"]},#{e["author_id"]},
+                                            '#{e["created_on"].to_s.gsub("+0800","").to_datetime.strftime("%Y-%m-%d %H:%M:%S")}',
+                                            '#{e["created_on"].to_s.gsub("+0800","").to_datetime.strftime("%Y-%m-%d %H:%M:%S")}')")
+  end
+end
+
+def down
+  ForgeActivity.delete_all([" forge_act_type = ?",ForgeActivity::TYPE_OF_ATTACHMENT_ACT])
+end
+end

db/migrate/20150305011023_create_organizations.rb

@@ -0,0 +1,10 @@
+class CreateOrganizations < ActiveRecord::Migration
+  def change
+    create_table :organizations do |t|
+      t.string :name
+      t.string :logo_link
+
+      t.timestamps
+    end
+  end
+end

db/migrate/20150305011359_add_organization_to_project.rb

@@ -0,0 +1,9 @@
+class AddOrganizationToProject < ActiveRecord::Migration
+  def up
+    add_column :projects, :organization_id, :integer
+  end
+
+  def down
+    remove_column :projects, :organization_id
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20150128032421) do
+ActiveRecord::Schema.define(:version => 20150302091345) do
 
   create_table "activities", :force => true do |t|
     t.integer "act_id",   :null => false
@@ -472,6 +472,18 @@ ActiveRecord::Schema.define(:version => 20150128032421) do
     t.integer  "show_contest", :default => 1
   end
 
+  create_table "forge_activities", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "project_id"
+    t.integer  "forge_act_id"
+    t.string   "forge_act_type"
+    t.integer  "org_id"
+    t.datetime "created_at",     :null => false
+    t.datetime "updated_at",     :null => false
+  end
+
+  add_index "forge_activities", ["forge_act_id"], :name => "index_forge_activities_on_forge_act_id"
+
   create_table "forums", :force => true do |t|
     t.string   "name",                        :null => false
     t.text     "description"
@@ -558,29 +570,30 @@ ActiveRecord::Schema.define(:version => 20150128032421) do
   add_index "issue_statuses", ["position"], :name => "index_issue_statuses_on_position"
 
   create_table "issues", :force => true do |t|
-    t.integer  "tracker_id",                          :null => false
+    t.integer  "tracker_id",                              :null => false
-    t.integer  "project_id",                          :null => false
+    t.integer  "project_id",                              :null => false
-    t.string   "subject",          :default => "",    :null => false
+    t.string   "subject",              :default => "",    :null => false
     t.text     "description"
     t.date     "due_date"
     t.integer  "category_id"
-    t.integer  "status_id",                           :null => false
+    t.integer  "status_id",                               :null => false
     t.integer  "assigned_to_id"
-    t.integer  "priority_id",                         :null => false
+    t.integer  "priority_id",                             :null => false
     t.integer  "fixed_version_id"
-    t.integer  "author_id",                           :null => false
+    t.integer  "author_id",                               :null => false
-    t.integer  "lock_version",     :default => 0,     :null => false
+    t.integer  "lock_version",         :default => 0,     :null => false
     t.datetime "created_on"
     t.datetime "updated_on"
     t.date     "start_date"
-    t.integer  "done_ratio",       :default => 0,     :null => false
+    t.integer  "done_ratio",           :default => 0,     :null => false
     t.float    "estimated_hours"
     t.integer  "parent_id"
     t.integer  "root_id"
     t.integer  "lft"
     t.integer  "rgt"
-    t.boolean  "is_private",       :default => false, :null => false
+    t.boolean  "is_private",           :default => false, :null => false
     t.datetime "closed_on"
+    t.integer  "project_issues_index"
   end
 
   add_index "issues", ["assigned_to_id"], :name => "index_issues_on_assigned_to_id"
@@ -618,6 +631,16 @@ ActiveRecord::Schema.define(:version => 20150128032421) do
 
   add_index "journal_details", ["journal_id"], :name => "journal_details_journal_id"
 
+  create_table "journal_details_copy", :force => true do |t|
+    t.integer "journal_id",               :default => 0,  :null => false
+    t.string  "property",   :limit => 30, :default => "", :null => false
+    t.string  "prop_key",   :limit => 30, :default => "", :null => false
+    t.text    "old_value"
+    t.text    "value"
+  end
+
+  add_index "journal_details_copy", ["journal_id"], :name => "journal_details_journal_id"
+
   create_table "journal_replies", :id => false, :force => true do |t|
     t.integer "journal_id"
     t.integer "user_id"
@@ -1013,12 +1036,12 @@ ActiveRecord::Schema.define(:version => 20150128032421) do
   end
 
   create_table "roles", :force => true do |t|
-    t.string  "name",              :limit => 30, :default => "",        :null => false
+    t.string  "name",              :limit => 90
-    t.integer "position",                        :default => 1
+    t.integer "position"
-    t.boolean "assignable",                      :default => true
+    t.boolean "assignable"
-    t.integer "builtin",                         :default => 0,         :null => false
+    t.integer "builtin"
     t.text    "permissions"
-    t.string  "issues_visibility", :limit => 30, :default => "default", :null => false
+    t.string  "issues_visibility", :limit => 90
   end
 
   create_table "schools", :force => true do |t|

lib/plugins/acts_as_activity_provider/lib/acts_as_activity_provider.rb

@@ -24,6 +24,10 @@ module Redmine
 
       module ClassMethods
         def acts_as_activity_provider(options = {})
+          # Time 2015-01-31 13:54:34
+          # Author lizanle
+          # Description  mod.included_modules -> array
+          # 返回mod包含的 modules数组
           unless self.included_modules.include?(Redmine::Acts::ActivityProvider::InstanceMethods)
             cattr_accessor :activity_provider_options
             send :include, Redmine::Acts::ActivityProvider::InstanceMethods

lib/redmine.rb

@@ -360,6 +360,7 @@ Redmine::MenuManager.map :homework_menu do |menu|
 end
 ########end
 Redmine::MenuManager.map :admin_menu do |menu|
+  menu.push :organization, {:controller => 'admin', :action => 'organization'}, :caption => :label_organization_list
   menu.push :projects, {:controller => 'admin', :action => 'projects'}, :caption => :label_project_plural
   menu.push :users, {:controller => 'admin', :action => 'users'}, :caption => :label_user_plural
   menu.push :first_page_made, {:controller => 'admin',:action => 'first_page_made'},:caption => :label_first_page_made

public/javascripts/application.js

@@ -1,4 +1,7 @@
 //= require_directory ./rateable
+//= require jquery.min
+//= require jquery.infinitescroll
+
 /* Redmine - project management software
    Copyright (C) 2006-2013  Jean-Philippe Lang */
 

spec/models/forge_activity_spec.rb

@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe ForgeActivity do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

spec/models/organization_spec.rb

@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe Organization do
+  pending "add some examples to (or delete) #{__FILE__}"
+end