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

app/controllers/boards_controller.rb

@@ -68,7 +68,7 @@ class BoardsController < ApplicationController
   end
 
   def show
-    #更新对应的forge_messages表的viewed字段
+    # 讨论区消息状态更新（已读和未读）
     if @project
       query_forge_messages = @board.messages
       query_forge_messages.each do |query_forge_message|

app/controllers/issues_controller.rb

@@ -119,12 +119,14 @@ class IssuesController < ApplicationController
     end
     # 缺陷状态更新
     query_journals = @issue.journals
-    if User.current.id == @issue.author_id
       query_journals.each do |query_journal|
-        query_journal.forge_messages.update_all(:viewed => true)
+        query_journal.forge_messages.each do |f|
+          if User.current.id == f.user_id
+            f.update_attributes(:viewed => true)
+          end
+        end
       end
-    end
-    #
+    # end
     @journals = @issue.journals.includes(:user, :details).reorder("#{Journal.table_name}.id ASC").all
     @journals.each_with_index {|j,i| j.indice = i+1}
     @journals.reject!(&:private_notes?) unless User.current.allowed_to?(:view_private_notes, @issue.project)

app/controllers/memos_controller.rb

@@ -115,10 +115,24 @@ class MemosController < ApplicationController
   
   REPLIES_PER_PAGE = 20 unless const_defined?(:REPLIES_PER_PAGE)
   def show
-    #更新贴吧帖子留言对应的memo_messages的viewed字段
+    # 更新贴吧帖子留言对应的memo_messages的viewed字段
+    unless @memo.children.blank?
+      @memo.children.each do |child|
+        child.memo_messages.each do |memo_message|
+          if User.current.id == memo_message.user_id
+            memo_message.update_attributes(:viewed => true)
+          end
+        end
+      end
+    end
     query_memo_messages = @memo.memo_messages
-    pre_count = REPLIES_PER_PAGE
+    query_memo_messages.each do |query_memo_message|
+      if User.current.id == query_memo_message.user_id
+        query_memo_message.update_attributes(:viewed => true)
+      end
+    end
 
+    pre_count = REPLIES_PER_PAGE
     @memo = @memo.root # 取出楼主，防止输入帖子id让回复作为主贴显示
     @memo.update_column(:viewed_count, (@memo.viewed_count.to_i + 1))
 

app/controllers/news_controller.rb

@@ -99,30 +99,32 @@ class NewsController < ApplicationController
    end
 
   def show
-    #更新news对应的forge_messages的viewed字段
-    query_forge_news = @news.forge_messages
-    query_forge_news.each do |query|
-      if User.current.id == query.user_id
-        query.update_attributes(:viewed => true)
-      end
+    # 更新news对应的forge_messages的消息viewed字段
+    if @project
+      query_message_news = @news.forge_messages
+    else
+      query_message_news = @news.course_messages
     end
-    #更新news对应的course_messages的viewed字段
-    query_course_news = @news.course_messages
-    query_course_news.each do |query|
-      if User.current.id == query.user_id
-        query.update_attributes(:viewed => true)
-      end
+    query_message_news.each do |query|
+        if User.current.id == query.user_id
+          query.update_attributes(:viewed => true)
+        end
+    end
+    # 更新项目新闻的评阅的消息viewed字段
+    current_message_comments = @news.comments
+    current_message_comments.each do |current_message_comment|
+    if @project
+      query_message_comment = current_message_comment.forge_messages
+    else
+      query_message_comment = current_message_comment.course_messages
     end
-    #更新项目新闻的评阅的viewed字段
-    current_forge_comments = @news.comments
-    current_forge_comments.each do |current_forge_comment|
-      query_forge_comment = current_forge_comment.forge_messages
-      query_forge_comment.each do |query|
+    query_message_comment.each do |query|
         if User.current.id == query.user_id
           query.update_attributes(:viewed => true)
         end
       end
     end
+    # end
 
     cs = CoursesService.new
     result = cs.show_course_news params,User.current

app/controllers/poll_controller.rb

@@ -28,6 +28,7 @@ class PollController < ApplicationController
       render_403
       return
     end
+    # 问卷消息状态更新
     query_course_poll = @poll.course_messages
     query_course_poll.each do |query|
       if User.current.id == query.user_id

app/controllers/users_controller.rb

@@ -106,16 +106,16 @@ class UsersController < ApplicationController
       return
     end
     # 当前用户查看消息，则设置消息为已读
-    course_querys = @user.course_messages
-    forge_querys = @user.forge_messages
-    user_querys = @user.user_feedback_messages
-    forum_querys = @user.memo_messages
-    if User.current.id == @user.id
-      course_querys.update_all(:viewed => true)
-      forge_querys.update_all(:viewed => true)
-      user_querys.update_all(:viewed => true)
-      forum_querys.update_all(:viewed => true)
-    end
+    # course_querys = @user.course_messages
+    # forge_querys = @user.forge_messages
+    # user_querys = @user.user_feedback_messages
+    # forum_querys = @user.memo_messages
+    # if User.current.id == @user.id
+    #   course_querys.update_all(:viewed => true)
+    #   forge_querys.update_all(:viewed => true)
+    #   user_querys.update_all(:viewed => true)
+    #   forum_querys.update_all(:viewed => true)
+    # end
     # @new_message_count = forge_querys.count + forum_querys.count + course_querys.count + user_querys.count
     case params[:type]
       when nil
@@ -126,46 +126,41 @@ class UsersController < ApplicationController
         end
       when 'homework'
         @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "HomeworkCommon", @user).order("created_at desc")
-        @message_alls_count = @message_alls.count
       when 'course_message'
         @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "Message", @user).order("created_at desc")
-        @message_alls_count = @message_alls.count
-      when 'forge_message'
-        @message_alls = ForgeMessage.where("forge_message_type =? and user_id =?", "Message", @user).order("created_at desc")
-        @message_alls_count = @message_alls.count
+      # when 'forge_message'
+      #   @message_alls = ForgeMessage.where("forge_message_type =? and user_id =?", "Message", @user).order("created_at desc")
+      #   @message_alls_count = @message_alls.count
       when 'course_news'
-        @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "News", @user).order("created_at desc")
-        @message_alls_count = @message_alls.count
+        # 课程通知包含发布的通知和回复的通知
+        @message_alls = CourseMessage.where("course_message_type =? or course_message_type =?", "News", "Comment").where("user_id =?", @user).order("created_at desc")
       #@user_course_messages_count = @user_course_messages.count
-      when 'forge_news'
-        @message_alls = ForgeMessage.where("forge_message_type =? and user_id =?", "News", @user).order("created_at desc")
-        @message_alls_count = @message_alls.count
-      when 'course_news_reply'
-        @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "Comment", @user).order("created_at desc")
-      when 'forge_news_reply'
-        @message_alls = ForgeMessage.where("forge_message_type =? and user_id =?", "Comment", @user).order("created_at desc")
-        @message_alls_count = @message_alls.count
-      when 'poll'
-        @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "Poll", @user).order("created_at desc")
-        @message_alls_count = @message_alls.count
-      when 'works_reviewers'
-        @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "StudentWorksScore", @user).order("created_at desc")
-        @message_alls_count = @message_alls.count
-      when 'works_reply'
-        @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "JournalsForMessage", @user).order("created_at desc")
-        @message_alls_count = @message_alls.count
+      # when 'forge_news'
+      #   @message_alls = ForgeMessage.where("forge_message_type =? and user_id =?", "News", @user).order("created_at desc")
+      #   @message_alls_count = @message_alls.count
+      # when 'course_news_reply'
+      #   @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "Comment", @user).order("created_at desc")
+      # when 'forge_news_reply'
+      #   @message_alls = ForgeMessage.where("forge_message_type =? and user_id =?", "Comment", @user).order("created_at desc")
+      #   @message_alls_count = @message_alls.count
+      # when 'poll'
+      #   @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "Poll", @user).order("created_at desc")
+      #   @message_alls_count = @message_alls.count
+      # when 'works_reviewers'
+      #   @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "StudentWorksScore", @user).order("created_at desc")
+      #   @message_alls_count = @message_alls.count
+      # when 'works_reply'
+      #   @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "JournalsForMessage", @user).order("created_at desc")
+      #   @message_alls_count = @message_alls.count
       when 'issue'
-        @message_alls = ForgeMessage.where("forge_message_type =? and user_id =?", "Issue", @user).order("created_at desc")
-        @message_alls_count = @message_alls.count
-      when 'issue_update' # 缺陷状态更新、留言
-        @message_alls = ForgeMessage.where("forge_message_type =? and user_id =?", "Journal", @user).order("created_at desc")
-        @message_alls_count = @message_alls.count
+        @message_alls = ForgeMessage.where("forge_message_type =? or forge_message_type =?" , "Issue", "Journal").where("user_id=?", @user).order("created_at desc")
+      # when 'issue_update' # 缺陷状态更新、留言
+      #   @message_alls = ForgeMessage.where("forge_message_type =? and user_id =?", "Journal", @user).order("created_at desc")
+      #   @message_alls_count = @message_alls.count
       when 'forum'
         @message_alls = MemoMessage.where("memo_type =? and user_id =?", "Memo", @user).order("created_at desc")
-        @message_alls_count = @message_alls.count
       when 'user_feedback'
         @message_alls = UserFeedbackMessage.where("journals_for_message_type =? and user_id =?", "JournalsForMessage", @user).order("created_at desc")
-        @message_alls_count = @message_alls.count
       else
         render_404
         return
@@ -542,6 +537,15 @@ class UsersController < ApplicationController
 
 # modified by fq
   def user_newfeedback
+    # 更新用户留言消息状态
+    @user.journals_for_messages.each do |jour_message|
+      jour_message.user_feedback_messages.each do |userfeedback_message|
+        if User.current.id == userfeedback_message.user_id
+          userfeedback_message.update_attributes(:viewed => true)
+        end
+      end
+    end
+    # end
     jours = @user.journals_for_messages.where('m_parent_id IS NULL').order('created_on DESC')
     if User.current == @user
       jours.update_all(:is_readed => true, :status => false)

app/helpers/application_helper.rb

@@ -760,7 +760,8 @@ module ApplicationHelper
     options  = args.extract_options!
     text = distance_of_time_in_words(Time.now, time)
     if @project
-      link_to(text, {:controller => 'activities', :action => 'index', :id => @project, :from => User.current.time_to_date(time)},options.reverse_merge(:title => format_time(time)))
+      content_tag('acronym', text, options.reverse_merge(:title => format_time(time)))
+      # link_to(text, {:controller => 'activities', :action => 'index', :id => @project, :from => User.current.time_to_date(time)},options.reverse_merge(:title => format_time(time)))
     else
       content_tag('acronym', text, options.reverse_merge(:title => format_time(time)))
     end

app/models/attachment.rb

@@ -73,7 +73,7 @@ class Attachment < ActiveRecord::Base
   cattr_accessor :thumbnails_storage_path
   @@thumbnails_storage_path = File.join(Rails.root, "tmp", "thumbnails")
 
-  before_save :files_to_final_location,:act_as_course_activity
+  before_save :files_to_final_location,:act_as_course_activity,:act_as_forge_activity
   after_create :office_conver, :be_user_score,:act_as_forge_activity
   after_update :office_conver, :be_user_score
   after_destroy :delete_from_disk,:down_user_score

app/models/journals_for_message.rb

@@ -202,24 +202,24 @@ class JournalsForMessage < ActiveRecord::Base
   # 用户留言消息通知
   def act_as_user_feedback_message
     # 主留言
-    receivers = []
-    if self.reply_id == 0
-      if self.user_id != self.jour_id  # 过滤自己给自己的留言消息
-        receivers << self.jour
-      end
-    else # 留言回复
-      reply_to = User.find(self.reply_id)
-      if self.user_id != self.reply_id # 添加我回复的那个人
-        receivers << reply_to
-      end
-      if self.user_id != self.parent.jour_id && self.reply_id != self.parent.jour_id # 给东家发信息，如果回复的对象是东家则不发
-        receivers << self.parent.jour
-      end
-    end
     if self.jour_type == 'Principal'
-        receivers.each do |r|
-          self.user_feedback_messages << UserFeedbackMessage.new(:user_id => r.id, :journals_for_message_id => self.id, :journals_for_message_type => "Principal", :viewed => false)
+      receivers = []
+      if self.reply_id == 0
+        if self.user_id != self.jour_id  # 过滤自己给自己的留言消息
+          receivers << self.jour
         end
+      else # 留言回复
+        reply_to = User.find(self.reply_id)
+        if self.user_id != self.reply_id # 添加我回复的那个人
+          receivers << reply_to
+        end
+        if self.user_id != self.parent.jour_id && self.reply_id != self.parent.jour_id # 给东家发信息，如果回复的对象是东家则不发
+          receivers << self.parent.jour
+        end
+      end
+      receivers.each do |r|
+        self.user_feedback_messages << UserFeedbackMessage.new(:user_id => r.id, :journals_for_message_id => self.id, :journals_for_message_type => "Principal", :viewed => false)
+      end
 
     end
   end

app/models/user_feedback_message.rb

@@ -8,7 +8,7 @@ class UserFeedbackMessage < ActiveRecord::Base
   validates :user_id,presence: true
   validates :journals_for_message_id,presence: true
   validates :journals_for_message_type, presence: true
-  after_create :add_user_message
+  after_save :add_user_message
 
   def add_user_message
     self.message_alls << MessageAll.new(:user_id => self.user_id)

app/views/courses/_courses_jours.html.erb

@@ -11,9 +11,11 @@
   div.recall_con{width:570px;}
   div.recall_con .reply_btn{margin-left:525px;margin-top:5px;}
 </style>
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
-<div class="msg_box fl" id='leave-message' nhname="new_message">
-  <%# reply_allow = JournalsForMessage.create_by_user? User.current %>
+<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"init_KindEditor"  %>
+<script >
+    init_KindEditor_data('');
+</script>
+<div class="msg_box fl mb10" id='leave-message'>
   <h4><%= l(:label_leave_message) %></h4>
 
   <% if !User.current.logged?%>
@@ -23,21 +25,15 @@
       <hr/>
     </div>
   <% else %>
-    <%= form_for('new_form', :method => :post,
-                 :url => {:controller => 'words', :action => 'leave_course_message'},:html => {:id=>'leave_message_form'}) do |f|%>
-      <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
-      <%#= f.kindeditor 'course_message',:height => '140px;',:editor_id => 'leave_message_editor',:input_html=>{:id => "leave_meassge",:style => "resize: none;",
-                 :placeholder => "#{l(:label_welcome_my_respond)}",:maxlength => 250}%>
-      <textarea cols="40" nhname="new_message_textarea" maxlength="250" name="new_form[course_message]" placeholder="请在此留下你的意见和建议！" rows="20" style="display: none;"></textarea>
-      <p nhname="contentmsg"></p>
-    <% end %>
-      <div class="cl"></div>
-      <div>
-        <div class="fl" style="padding-top:5px;" nhname="toolbar_container"></div>
-        <a href="javascript:void(0)" class="grey_btn fr ml10 mt10" nhname="cancel_btn">取&nbsp;&nbsp;消</a>
-        <a href="javascript:void(0)"  onclick='$("#leave_message_form").submit();' class="blue_btn fr mt10">
-          <%= l(:button_leave_meassge)%>
-        </a>
+      <div nhname='new_message_' style="display:none;">
+        <%= form_for('new_form',:url =>  {:controller => 'words', :action => 'leave_course_message'},:method => "post") do |f|%>
+            <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
+            <textarea placeholder="有问题或有建议，请直接给我留言吧！" nhname='new_message_textarea_' name="new_form[course_message]"></textarea>
+            <p nhname='contentmsg_'></p>
+            <div nhname='toolbar_container_' style="float:left;padding-top:3px;margin-bottom: 15px;"></div>
+            <a id="new_message_cancel_btn_" href="javascript:void(0)" class="grey_btn fr mt10">取消</a>
+            <a id="new_message_submit_btn_" href="javascript:void(0)" class="blue_btn fr ml10 mt10">留言</a>
+        <% end%>
       </div>
   <% end %>
 </div>
@@ -54,106 +50,6 @@
 
 <script type="text/javascript">
   $(function(){
-
-    function init_editor(params){
-      params.textarea.removeAttr('placeholder');
-      var editor = params.kindutil.create(params.textarea, {
-        resizeType : 1,minWidth:"1px",width:"100%",height:"150px",
-        items:['emoticons'],
-        afterChange:function(){//按键事件
-          nh_check_field({content:this,contentmsg:params.contentmsg,textarea:params.textarea});
-        },
-        afterCreate:function(){
-          var toolbar = $("div[class='ke-toolbar']",params.div_form);
-          $(".ke-outline>.ke-toolbar-icon",toolbar).append('表情');
-          params.toolbar_container.append(toolbar);
-        }
-      }).loadPlugin('paste');
-      return editor;
-    }
-
-    function nh_check_field(params){
-      var result=true;
-      if(params.content!=undefined){
-        if(params.content.isEmpty()){
-          result=false;
-        }
-        if(params.content.html()!=params.textarea.html() || params.issubmit==true){
-          params.textarea.html(params.content.html());
-          params.content.sync();
-          if(params.content.isEmpty()){
-            params.contentmsg.html('内容不能为空');
-            params.contentmsg.css({color:'#ff0000'});
-          }else{
-            params.contentmsg.html('填写正确');
-            params.contentmsg.css({color:'#008000'});
-          }
-          params.contentmsg.show();
-        }
-      }
-      return result;
-    }
-    function init_form(params){
-//      var flag = false;
-//      if(params.form.attr('data-remote') != undefined ){
-//        flag = true
-//      }
-//      params.form[0].onsubmit = function(){
-//        if(flag){
-//          $(this).removeAttr('data-remote');//不这么搞return false没用 花擦花擦
-//        }
-//        var is_checked = nh_check_field({
-//          issubmit:true,
-//          content:params.editor,
-//          contentmsg:params.contentmsg,
-//          textarea:params.textarea
-//        });
-//        if(is_checked){
-//          if(flag){
-//            alert('add')
-//            $(this).attr('data-remote','true');
-//          }
-//          alert('ok')
-//          return true;
-//        }
-//        return false;
-//      }
-
-      params.form.submit(function(){
-        var flag = false;
-        if(params.form.attr('data-remote') != undefined ){
-          flag = true
-        }
-        var is_checked = nh_check_field({
-          issubmit:true,
-          content:params.editor,
-          contentmsg:params.contentmsg,
-          textarea:params.textarea
-        });
-        if(is_checked){
-          if(flag){
-            return true;
-          }else{
-            $(this)[0].submit();
-            return false;
-          }
-//          return true;      //这个涛哥的firefox不能提交
-          //$(this).trigger('submit');  //这个虽然能提交  但是他是个死循环
-          //$(this)[0].submit();        //用这个form的data-remote='true'没效果了
-          //肿么破阿  我滴个神   实在不行就用$.ajax()算了
-        }
-        return false;
-      });
-    }
-    function nh_reset_form(params){
-      params.form[0].reset();
-      params.textarea.empty();
-      if(params.editor != undefined){
-        params.editor.html(params.textarea.html());
-      }
-      params.contentmsg.hide();
-    }
-
     KindEditor.ready(function(K){
       $("a[nhname='reply_btn']").live('click',function(){
         var params = {};
@@ -179,33 +75,10 @@
             params.textarea.show();
             params.textarea.focus();
             params.textarea.hide();
-//            $("#nhjump").attr('href','#'+params.div_form.attr('id'));
-//            $("#nhjump")[0].click();
           }
         },300);
         params.textarea.data('init',1);
       });
-
-      $("div[nhname='new_message']").each(function(){
-        var params = {};
-        params.kindutil = K;
-        params.div_form = $(this);
-        params.form = $("form",params.div_form);
-        if(params.form==undefined || params.form.length==0){
-          return;
-        }
-        params.textarea = $("textarea[nhname='new_message_textarea']",params.div_form);
-        params.contentmsg = $("p[nhname='contentmsg']",params.div_form);
-        params.toolbar_container = $("div[nhname='toolbar_container']",params.div_form);
-        if(params.textarea.data('init') == undefined){
-          params.editor = init_editor(params);
-          init_form(params);
-          $("a[nhname='cancel_btn']",params.div_form).click(function(){
-            nh_reset_form(params);
-          });
-          params.textarea.data('init',1);
-        }
-      });
     });
   });
 </script>

app/views/users/_user_activities.html.erb

@@ -61,4 +61,7 @@
     <% end %>
 <% end %>
 <input type="hidden" value="<%= page%>"/>
-<%= link_to "点击展开更多",user_activities_path(@user.id,:type => type),:id => "show_more_activities",:remote => "true",:class => "loadMore mt10 f_grey"%>
+
+<% if user_activities.count == 10%>
+    <%= link_to "点击展开更多",user_activities_path(@user.id,:type => type,:page => page),:id => "show_more_activities",:remote => "true",:class => "loadMore mt10 f_grey"%>
+<% end%>

app/views/users/_user_homework_list.html.erb

@@ -54,4 +54,4 @@
 <% end%>
 
 <input type="hidden" value="<%= page%>" />
-<%= link_to "加载更多",user_homeworks_user_path(User.current.id),:id => "user_show_more_homework",:remote => "true",:class => "loadMore f_grey"%>
+<%= link_to "加载更多",user_homeworks_user_path(User.current.id, :page=> page),:id => "user_show_more_homework",:remote => "true",:class => "loadMore f_grey"%>

app/views/users/show.js.erb

@@ -1,4 +1,2 @@
 $("#show_more_activities").replaceWith("<%= escape_javascript( render :partial =>  'users/user_activities',:locals => {:user_activities => @user_activities, :page => @page,:type => @type} )%>");
-<% if @user_activities.count < 10%>
-$("#show_more_activities").hide();
-<% end%>
+

app/views/users/user_messages.html.erb

@@ -19,9 +19,9 @@
           <!--<li><%#= link_to "项目新闻", user_message_path(User.current, :type => 'forge_news'), :class => "resourcesGrey"  %></li>-->
           <!--<li><%#= link_to "新闻回复", user_message_path(User.current, :type => 'forge_news_reply'), :class => "resourcesGrey"  %></li>-->
           <%# 项目相关消息 %>
-          <!--<li><%#= link_to "贴吧帖子", user_message_path(User.current, :type => 'forum'), :class => "resourcesGrey"  %></li>-->
+          <li><%= link_to "贴吧帖子", user_message_path(User.current, :type => 'forum'), :class => "resourcesGrey"  %></li>
           <%# 系统贴吧 %>
-          <!--<li><%#= link_to "用户留言",user_message_path(User.current, :type => 'user_feedback'), :class => "resourcesGrey"  %></li>-->
+          <li><%= link_to "用户留言",user_message_path(User.current, :type => 'user_feedback'), :class => "resourcesGrey"  %></li>
 
         </ul>
       </li>
@@ -61,7 +61,7 @@
                       <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a></li>
                       <li class="homepageNewsPubType fl"><%=link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %><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.name, student_work_index_path(:homework => ma.course_message.id),:class => "newsGrey", :title => "#{ma.course_message.name}" %></a></li>
+                        <%= link_to ma.course_message.name, student_work_index_path(:homework => ma.course_message.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :title => "#{ma.course_message.name}" %></a></li>
                       <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
                     </ul>
                 <% end %>
@@ -81,8 +81,9 @@
                       <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"), user_path(ma.course_message.author) %></a></li>
                       <li class="homepageNewsPubType fl"><%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher" %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>"><%= ma.course_message.parent_id.nil? ? "发布了课程帖子：" : "评论了课程帖子：" %></span></li>
                       <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                        <%=link_to ma.course_message.subject.html_safe, course_boards_path(ma.course_message.course,:parent_id => ma.course_message.parent_id ? ma.course_message.parent_id : ma.course_message.id,
-                                                                                           :topic_id => ma.course_message.id),:class=>"#{ma.viewed==0?"newsBlack":"newsGrey"}",
+                        <%= link_to ma.course_message.parent_id.nil? ? ma.course_message.subject.html_safe : ma.course_message.content.html_safe,
+                                    course_boards_path(ma.course_message.course, :parent_id => ma.course_message.parent_id ? ma.course_message.parent_id : ma.course_message.id, :topic_id => ma.course_message.id),
+                                    :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}",
                                    :title => "#{ma.course_message.subject.html_safe}" %></a></li>
                       <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
 
@@ -94,7 +95,7 @@
                       <li class="homepageNewsPubType fl"><%=link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>"><%= ma.status == 0 ? "评阅了作品：" : "重新评阅了作品:" %></span></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),:class=>"newsGrey",:title => "#{ma.content.html_safe}" %></a></li>
+                            <%= link_to ma.content.html_safe, student_work_index_path(:homework => ma.course_message.student_work.homework_common_id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",:title => "#{ma.content.html_safe}" %></a></li>
                         <% end %>
                         <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
                         </ul>
@@ -104,7 +105,7 @@
                       <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a></li>
                       <li class="homepageNewsPubType fl"><%=link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %><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=>"newsGrey",:title => "#{ma.course_message.notes}" %></a></li>
+                        <%= 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"}",:title => "#{ma.course_message.notes}" %></a></li>
                       <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
                     </ul>
                 <% end %>
@@ -150,7 +151,7 @@
                       <li class="homepageNewsPubType fl"><%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue homepageNewsPublisher" %>
                         <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>"><%= ma.forge_message.parent_id.nil? ? "发布了项目帖子：" : "评论了项目帖子：" %></span></li>
                       <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                        <%=link_to ma.forge_message.subject.html_safe, project_boards_path(ma.forge_message.project,
+                        <%=link_to ma.forge_message.parent_id.nil? ? ma.forge_message.subject.html_safe : ma.forge_message.content.html_safe, project_boards_path(ma.forge_message.project,
                                                                                            :parent_id => ma.forge_message.parent_id ? ma.forge_message.parent_id : ma.forge_message.id,
                                                                                            :topic_id => ma.forge_message.id),:class=>"#{ma.viewed==0?"newsBlack":"newsGrey"}",
                                    :title => "#{ma.forge_message.subject.html_safe}" %></a></li>
@@ -167,7 +168,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.forge_message.title.html_safe}"), {:controller => 'news', :action => 'show', :id => ma.forge_message.id}, :class => "newsGrey", :title => "#{ma.forge_message.title.html_safe}" %></a>
+                        <%= link_to ("#{ma.forge_message.title.html_safe}"), {:controller => 'news', :action => 'show', :id => ma.forge_message.id},  :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :title => "#{ma.forge_message.title.html_safe}" %></a>
                       </li>
                       <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
                     </ul>
@@ -196,7 +197,7 @@
                         <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>" ><%= ma.memo.parent_id.nil? ? "在贴吧发布帖子：" : "回复了贴吧帖子：" %></span>
                       </li>
                       <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                        <%= link_to ma.memo.subject, forum_memo_path(ma.memo.forum_id, ma.memo.parent_id ? ma.memo.parent_id: ma.memo.id),:class => "newsGrey" , :title => "#{ma.memo.content.html_safe}" %></a>
+                        <%= link_to ma.memo.parent_id.nil? ? ma.memo.subject : ma.memo.content, forum_memo_path(ma.memo.forum_id, ma.memo.parent_id ? ma.memo.parent_id: ma.memo.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :title => "#{ma.memo.parent_id.nil? ? ma.memo.subject : ma.memo.content}" %></a>
                       </li>
                       <li class="homepageNewsTime fl"><%= time_tag(ma.memo.created_at).html_safe %> </li>
                     </ul>
@@ -214,9 +215,10 @@
                         <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>"><%= ma.journals_for_message.reply_id == 0 ? "给你留言了：" : "回复了你的留言：" %></span>
                       </li>
                       <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                        <%= link_to ma.journals_for_message.notes.html_safe, feedback_path(ma.journals_for_message.jour_id), :class => "newsGrey", :title => "#{ma.journals_for_message.notes}" %></a>
+                        <%= link_to ma.journals_for_message.notes.html_safe, feedback_path(ma.journals_for_message.jour_id),  :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :title => "#{ma.journals_for_message.notes}" %></a>
                       </li>
                       <li class="homepageNewsTime fl"><%= time_tag(ma.journals_for_message.created_on).html_safe %> </li>
+
                     </ul>
                 <% end %>
             <% end %>
@@ -244,4 +246,3 @@
 
 
 
-

db/migrate/20150831070611_about_memo_message.rb

@@ -0,0 +1,36 @@
+class AboutMemoMessage < ActiveRecord::Migration
+  def up
+    Memo.all.each do |memo|
+      transaction do
+        # 贴吧帖子
+        receivers = []
+        u = User.find(6)
+        receivers << u
+        # 主贴
+        if memo.parent_id.nil?
+          if memo.author_id != memo.forum.creator_id # 发帖人不是吧主
+            receivers << memo.forum.creator
+          end
+        else # 回帖
+          # 添加吧主
+          if memo.author_id != memo.forum.creator_id
+            receivers << memo.forum.creator
+          end
+          # 添加发帖人
+          unless memo.parent.nil?
+            if  memo.author_id != memo.parent.author_id
+              receivers << memo.parent.author
+              puts memo.id
+            end
+          end
+        end
+        receivers.each do |r|
+          memo.memo_messages << MemoMessage.new(:user_id => r.id, :forum_id => memo.forum_id, :memo_id => memo.id, :memo_type => "Memo", :viewed => true)
+        end
+      end
+    end
+  end
+
+  def down
+  end
+end

db/migrate/20150831093918_about_user_feedback_message.rb

@@ -0,0 +1,36 @@
+class AboutUserFeedbackMessage < ActiveRecord::Migration
+  def up
+    JournalsForMessage.all.each do |jour_for_message|
+      transaction do
+        # 主留言
+        if jour_for_message.jour_type == 'Principal'
+          receivers = []
+          if jour_for_message.reply_id == 0
+            if jour_for_message.user_id != jour_for_message.jour_id  # 过滤自己给自己的留言消息
+              receivers << jour_for_message.jour
+            end
+          else # 留言回复
+            reply_to = User.find(jour_for_message.reply_id)
+            if jour_for_message.user_id != jour_for_message.reply_id # 添加我回复的那个人
+              receivers << reply_to
+            end
+            unless jour_for_message.parent.nil?
+              if jour_for_message.user_id != jour_for_message.parent.jour_id && jour_for_message.reply_id != jour_for_message.parent.jour_id # 给东家发信息，如果回复的对象是东家则不发
+                receivers << jour_for_message.parent.jour
+              end
+            end
+          end
+          unless receivers.blank?
+            receivers.each do |r|
+              puts jour_for_message.id
+              jour_for_message.user_feedback_messages << UserFeedbackMessage.new(:user_id => r.id, :journals_for_message_id => jour_for_message.id, :journals_for_message_type => "Principal", :viewed => true)
+            end
+          end
+        end
+      end
+    end
+  end
+
+  def down
+  end
+end

db/migrate/20150901004812_update_memo_message_time.rb

@@ -0,0 +1,26 @@
+class UpdateMemoMessageTime < ActiveRecord::Migration
+  def up
+    memo_count = Memo.all.count / 30 + 1
+    transaction do
+      for i in 1 ... memo_count do i
+      MemoMessage.page(i).per(30).each do |memo_message|
+        if memo_message.memo
+          if memo_message.memo.respond_to?("created_at")
+            memo_message.created_at = memo_message.memo.created_at
+          elsif memo_message.memo.respond_to?("created_on")
+            memo_message.created_at = memo_message.memo.created_on
+          end
+          memo_message.save
+
+          memo_messages = MessageAll.where("message_type = '#{memo_message.class.to_s}' and message_id = '#{memo_message.id}'").first
+          memo_messages.created_at = memo_message.created_at
+          memo_messages.save
+        end
+      end
+      end
+    end
+  end
+
+  def down
+  end
+end

db/migrate/20150901004910_update_userfeeback_message_time.rb

@@ -0,0 +1,27 @@
+class UpdateUserfeebackMessageTime < ActiveRecord::Migration
+  def up
+    user_feedback_count = UserFeedbackMessage.all.count / 30 + 1
+    transaction do
+      for i in 1 ... user_feedback_count do i
+      UserFeedbackMessage.page(i).per(30).each do |ufm|
+        if ufm.journals_for_message
+          if ufm.journals_for_message.respond_to?("created_at")
+            ufm.created_at = ufm.journals_for_message.created_at
+          elsif ufm.journals_for_message.respond_to?("created_on")
+            ufm.created_at = ufm.journals_for_message.created_on
+          end
+          puts ufm.id
+          ufm.save
+
+          user_feedback_messages = MessageAll.where("message_type = '#{ufm.class.to_s}' and message_id = '#{ufm.id}'").first
+          user_feedback_messages.created_at = ufm.created_at
+          user_feedback_messages.save
+        end
+      end
+      end
+    end
+  end
+
+  def down
+  end
+end

public/javascripts/project.js

@@ -248,6 +248,13 @@ function regexDescription() {
         $("#description_notice_span").focus();
         return false;
     }
+    else if (name.length > 10000)
+    {
+        $("#description_notice_span").text("描述超过10000个字符");
+        $("#description_notice_span").css('color', '#ff0000');
+        $("#description_notice_span").focus();
+        return false;
+    }
     else {
         $("#description_notice_span").text("填写正确");
         $("#description_notice_span").css('color', '#008000');

public/javascripts/user.js

@@ -1,7 +1,7 @@
 //个人动态
 $(function(){
     KindEditor.ready(function(K){
-        $("a[nhname='reply_btn']").on('click',function(){
+        $("a[nhname='reply_btn']").live('click',function(){
             var params = {};
             params.kindutil = K;
             params.container = $(this).parent().parent('div');
@@ -35,7 +35,7 @@ $(function(){
             },300);
         });
 
-        $("a[nhname='sub_reply_btn']").on('click',function(){
+        $("a[nhname='sub_reply_btn']").live('click',function(){
             var params = {};
             params.kindutil = K;
             params.container = $(this).parent().parent('div');

public/stylesheets/courses.css

@@ -769,4 +769,5 @@ a.FilesName{ max-width:540px;overflow:hidden; white-space:nowrap; text-overflow:
 a.FilesName02{ max-width:665px;overflow:hidden; white-space:nowrap; text-overflow:ellipsis; display:block;}
 .ProResultUl span { display:block; float:left;}
 .ProResultUl li{  line-height:35px;  border-bottom:1px solid #dddddd; }
-.DateBorder{border:1px solid #d9d9d9; border-left:none; padding:7px 6px 6px 6px;}
+.DateBorder{border:1px solid #d9d9d9; border-left:none; padding:7px 6px 6px 6px;}
+.mb50{margin-bottom: 50px;}

public/stylesheets/new_user.css

@@ -525,6 +525,7 @@ a.replyGrey1 {color:#888888;}
 a.replyGrey1:hover {color:#4b4b4b;}
 a.newsBlue {color:#269ac9;}
 a.newsBlue:hover {color:#297fb8;}
+a.newsBlack {color:#000000; font-size:13px; font-weight:bold}
 a.menuGrey {color:#808080;}
 a.menuGrey:hover {color:#fe7d68;}
 .navSearchTypeBox {width:368px; height:35px; position:absolute; border:1px solid #e1e1e1; background-color:#ffffff; padding-left:10px; display:none; color:#3e3e3e; font-size:14px;}
@@ -905,7 +906,7 @@ img.ui-datepicker-trigger {
     margin: 7px;
 }
 /*消息*/
-.homepageNewsTypeNotRead {width:95px; font-size:12px; color:#888888; display:block;}
+.homepageNewsTypeNotRead {width:100px; padding-left: 5px; font-size:12px; color:#4b4b4b; font-weight:bold; display:block;}
 .calendar_input{border-left:none !important;border-bottom: none!important; border-top: none!important; border-right: 1px solid #d9d9d9;}
 .calendar_div{border: 1px solid #d9d9d9;}
 /*缺陷更新动态在消息中显示样式*/

public/stylesheets/project.css

@@ -507,7 +507,7 @@ img.ui-datepicker-trigger {
 .wiki_new_ul input{ height:26px; margin-bottom:10px;}
 .wiki_con_tit{ font-size:14px; color:#09658c; font-weight:bold;width:630px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; margin-bottom:10px;}
 .wiki_con_box{ line-height:1.9; color:#2d2d2d;}
-.wiki_page_con{ border-bottom:1px dashed #CCC; margin-bottom:10px; padding-bottom:10px;}
+.wiki_page_con{ border-bottom:1px dashed #CCC; margin-bottom:10px; padding-bottom:10px; word-wrap:break-word; word-break:break-all}
 .wiki_page p{word-break: break-all;word-wrap: break-word;}
 #wiki_new_box{ display:none;}
 /*wiki显示附加*/