Merge branch 'hjq_new_course' into alan_develop

app/controllers/boards_controller.rb

@@ -70,31 +70,16 @@ class BoardsController < ApplicationController
   def show
     # 讨论区消息状态更新（已读和未读）
     if @project
-      query_forge_messages = @board.messages
+      ForgeMessage.where("user_id =? and project_id =? and viewed =?", User.current.id, @project.id, 0).update_all(:viewed => true)
-      query_forge_messages.each do |query_forge_message|
-        query = query_forge_message.forge_messages
-        query.each do |forge_message|
-          if User.current.id == forge_message.user_id
-            forge_message.update_attributes(:viewed => true)
-          end
-        end
-      end
       # 更新@消息为已读
-      @project.boards.each do |board|
+      # 注释掉这句是因为和上面的方法代码重复，一个类型的消息，已经更新就不需要再更新
-        board.messages.each do |m|
+      # @project.boards.each do |board|
-          User.current.at_messages.unviewed('Message', m.id).each {|x| x.viewed!}
+      #   board.messages.each do |m|
-        end
+      #     User.current.at_messages.unviewed('Message', m.id).each {|x| x.viewed!}
-      end
+      #   end
+      # end
     elsif @course
-      query_course_messages = @board.messages
+      CourseMessage.where("user_id =? and course_id =? and viewed =?", User.current.id, @course.id, 0).update_all(:viewed => true)
-      query_course_messages.each do |query_course_message|
-        query = query_course_message.course_messages
-        query.each do |course_message|
-          if User.current.id == course_message.user_id
-            course_message.update_attributes(:viewed => true)
-          end
-        end
-      end
     end
 
     sort_init 'updated_on', 'desc'

app/controllers/projects_controller.rb

@@ -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'

app/controllers/student_work_controller.rb

@@ -230,12 +230,12 @@ class StudentWorkController < ApplicationController
         render_403
         return
       end
-
       @student_work_count = (search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").order("#{@order} #{@b_sort}"),@name).count
     end
 
     @score = @b_sort == "desc" ? "asc" : "desc"
-
+    # 消息传过来的ID
+    @message_student_work_id = params[:student_work_id]
     respond_to do |format|
       format.js
       format.html

app/models/project.rb

@@ -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,
+   self.forge_acts << ForgeActivity.new(:user_id => User.current.id, :project_id => self.id)
-                      :forge_act_id => self.id,:forge_act_type => "ProjectCreateInfo")
-   fa.save!
  end
 
 

app/views/layouts/base_projects.html.erb

@@ -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>-->
-            <!--&lt;!&ndash;<%# if User.current.allowed_to?(:manage_members, @project) %>&ndash;&gt;-->
-              <!--<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} %>

app/views/projects/_project_activities.html.erb

@@ -73,12 +73,11 @@
         </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" %>
             <%= render :partial => 'users/project_issue', :locals => {:activity => activity.forge_act, :user_activity_id => activity.id, :project_id => activity.project_id} %>
-
             <!--message    -->
         <% when "Message" %>
             <%= render :partial => 'users/project_message', :locals => {:activity => activity.forge_act,:user_activity_id =>activity.id,:is_course=>1,:is_board=>0} %>

app/views/student_work/_student_work_list.html.erb

@@ -47,7 +47,10 @@
 <script type="text/javascript">
   $(function(){
       <% if !@is_evaluation && !@is_teacher %>
-          <% work=@homework.student_works.where("user_id = ?",User.current.id).first %>
+        <% work = @homework.student_works.where("user_id = ?",User.current.id).first %>
+      <% elsif !@message_student_work_id.nil? %>
+        <% work = @homework.student_works.where("id =?", @message_student_work_id).first %>
+      <% end %>
       <% unless work.nil? %>
       <% if @homework.homework_type == 2 %>
       $("#about_hwork_<%= work.id%>").html("<%= escape_javascript(render :partial => 'programing_work_show',:locals => {:work =>work,:score =>student_work_score(work,User.current),:student_work_scores => work.student_works_scores.order("updated_at desc")}) %>");
@@ -83,6 +86,5 @@
       <% end %>
       $('#score_<%= work.id%>').peSlider({range: 'min'});
       <% end %>
-      <% end %>
   });
 </script>

app/views/users/_project_attachment.html.erb

@@ -1,5 +1,3 @@
-
-
 <div class="resources mt10">
   <div class="homepagePostBrief">
     <div class="homepagePostPortrait">

app/views/users/_user_message_course.html.erb

@@ -167,7 +167,7 @@
           </li>
           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
             <% unless ma.content.nil? %>
-                <%= link_to ma.content.html_safe, student_work_index_path(:homework => ma.course_message.student_work.homework_common_id),
+                <%= link_to ma.content.html_safe, student_work_index_path(:homework => ma.course_message.student_work.homework_common_id, :student_work_id => ma.course_message.student_work),
                             :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
                             <!--:onmouseover =>"message_titile_show($(this),event)",-->
                             <!--:onmouseout => "message_titile_hide($(this))" %>-->
@@ -208,7 +208,7 @@
                 <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">回复了作品评论：</span>
               </li>
               <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                <%= link_to ma.course_message.notes, student_work_index_path(:homework => ma.course_message.jour.student_work.homework_common_id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+                <%= link_to ma.course_message.notes, student_work_index_path(:homework => ma.course_message.jour.student_work.homework_common_id, :student_work_id => ma.course_message.jour.student_work), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
                             <!--:onmouseover => "message_titile_show($(this),event)",-->
                             <!--:onmouseout => "message_titile_hide($(this))" %>-->
                 </a>

db/migrate/20160324052634_change_project_create_type.rb

@@ -0,0 +1,8 @@
+class ChangeProjectCreateType < ActiveRecord::Migration
+  def up
+    execute("update forge_activities set forge_act_type = 'Project' where  forge_act_type = 'ProjectCreateInfo'")
+  end
+
+  def down
+  end
+end

db/migrate/20160324074942_add_index_to_forge_activities.rb

@@ -0,0 +1,5 @@
+class AddIndexToForgeActivities < ActiveRecord::Migration
+  def change
+    add_index :forge_activities, [:project_id, :forge_act_id, :created_at]
+  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 => 20160321080825) do
+ActiveRecord::Schema.define(:version => 20160324052634) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -465,7 +465,6 @@ ActiveRecord::Schema.define(:version => 20160321080825) do
     t.integer  "status"
   end
 
-  add_index "course_messages", ["course_message_id"], :name => "index_course_messages_on_course_message_id"
   add_index "course_messages", ["course_message_type"], :name => "index_course_messages_on_course_message_type"
   add_index "course_messages", ["user_id", "course_id", "created_at"], :name => "index_course_messages_on_user_id_and_course_id_and_created_at"
 
@@ -1088,7 +1087,8 @@ ActiveRecord::Schema.define(:version => 20160321080825) do
     t.datetime "updated_at",   :null => false
   end
 
-  add_index "message_alls", ["message_id", "message_type", "created_at"], :name => "index_message_alls_on_message_id_and_message_type_and_created_at"
+  add_index "message_alls", ["message_type"], :name => "index_message_alls_on_message_type"
+  add_index "message_alls", ["user_id", "message_id", "created_at"], :name => "index_message_alls_on_user_id_and_message_id_and_created_at"
 
   create_table "messages", :force => true do |t|
     t.integer  "board_id",                         :null => false