项目创建的动态以多态形式存入forge_activities
This commit is contained in:
parent
d6f81c8978
commit
1330f02db8
|
@ -308,7 +308,7 @@ class ProjectsController < ApplicationController
|
|||
if User.current.member_of?(@project) || User.current.admin?
|
||||
case params[:type]
|
||||
when nil
|
||||
@events_pages = ForgeActivity.where("project_id = ? and forge_act_type in ('Issue', 'Message','News', 'ProjectCreateInfo', 'Attachment')", @project).includes(:forge_act).order("updated_at desc").limit(10).offset(@page * 10)
|
||||
@events_pages = ForgeActivity.where("project_id = ? and forge_act_type in ('Issue', 'Message','News', 'Project', 'Attachment')", @project).includes(:forge_act).order("updated_at desc").limit(10).offset(@page * 10)
|
||||
when 'issue'
|
||||
@events_pages = ForgeActivity.where("project_id = ? and forge_act_type = 'Issue'", @project).includes(:forge_act).order("updated_at desc").limit(10).offset(@page * 10)
|
||||
when 'news'
|
||||
|
|
|
@ -108,7 +108,8 @@ class Project < ActiveRecord::Base
|
|||
has_many :tags, :through => :project_tags, :class_name => 'Tag'
|
||||
has_many :project_tags, :class_name => 'ProjectTags'
|
||||
# 动态级联删除
|
||||
has_many :forge_activities, :class_name => 'ForgeActivity', :dependent => :destroy
|
||||
has_many :forge_acts, :class_name => 'ForgeActivity',:as =>:forge_act ,:dependent => :destroy
|
||||
#has_many :forge_activities, :class_name => 'ForgeActivity', :as =>:forge_act, :dependent => :destroy
|
||||
# 关联虚拟表
|
||||
has_many :forge_messages, :class_name =>'ForgeMessage', :as => :forge_message, :dependent => :destroy
|
||||
|
||||
|
@ -1212,9 +1213,7 @@ class Project < ActiveRecord::Base
|
|||
# Author lizanle
|
||||
# Description 新建项目要在ForgeActivities中加一条数据。
|
||||
def acts_as_forge_activities
|
||||
fa = ForgeActivity.new(:user_id => User.current.id,:project_id => self.id,
|
||||
:forge_act_id => self.id,:forge_act_type => "ProjectCreateInfo")
|
||||
fa.save!
|
||||
self.forge_acts << ForgeActivity.new(:user_id => User.current.id, :project_id => self.id)
|
||||
end
|
||||
|
||||
|
||||
|
|
|
@ -44,8 +44,6 @@
|
|||
<div class="cl"></div>
|
||||
|
||||
<div id="Container">
|
||||
|
||||
<%#= render :partial => 'layouts/new_header'%>
|
||||
<div class="cl"></div>
|
||||
|
||||
<div id="content">
|
||||
|
@ -104,20 +102,6 @@
|
|||
|
||||
<!--邀请加入-->
|
||||
<div class="subNavBox">
|
||||
<%# if User.current.member_of?(@project) %>
|
||||
<!--<div class="subNav currentDd currentDt subNav_jiantou" id="expand_tools_expand_invit" nhtype="toggle4cookie" data-id="expand_invit" data-target="#navContent_invit" data-val="expand">-->
|
||||
<!--<%#= l(:label_invite)%>-->
|
||||
<!--</div>-->
|
||||
<!--<ul class="navContent " style="display:block" id="navContent_invit">-->
|
||||
<!--<li><%#= link_to l(:label_invite_new_user), :controller=>"projects", :action=>"invite_members_by_mail", :id => @project %></li>-->
|
||||
<!--<!–<%# if User.current.allowed_to?(:manage_members, @project) %>–>-->
|
||||
<!--<li><%#= link_to l(:label_invite_trustie_user), :controller=>"projects", :action=>"invite_members", :id => @project %></li>-->
|
||||
<!--<%# end %>-->
|
||||
<!--</ul>-->
|
||||
<%# end %><!--end-->
|
||||
<!--menu 左侧工具栏 -->
|
||||
<%#--project_new_type: 1为开发组;2为科研组;3为朋友圈子--%>
|
||||
|
||||
<div id="project_memu_list">
|
||||
<% if @project.project_new_type == 1 || @project.project_new_type.nil? %>
|
||||
<%= render :partial => 'projects/development_group', :locals => {:project => @project} %>
|
||||
|
|
|
@ -73,7 +73,7 @@
|
|||
</script>
|
||||
<!--创建-->
|
||||
<% case activity.forge_act_type %>
|
||||
<% when "ProjectCreateInfo" %>
|
||||
<% when "Project" %>
|
||||
<%= render :partial => 'projects/project_create', :locals => {:activity => activity, :user_activity_id => activity.id} %>
|
||||
<!--缺陷动态-->
|
||||
<% when "Issue" %>
|
||||
|
|
Loading…
Reference in New Issue