缺陷的回复功能

app/controllers/issues_controller.rb

@@ -20,11 +20,11 @@ class IssuesController < ApplicationController
   default_search_scope :issues
 
   before_filter :authorize1, :only => [:show]
-  before_filter :find_issue, :only => [:show, :edit, :update]
+  before_filter :find_issue, :only => [:show, :edit, :update,:add_journal]
   before_filter :find_issues, :only => [:bulk_edit, :bulk_update, :destroy]
   before_filter :find_project, :only => [:new, :create, :update_form]
   #before_filter :authorize, :except => [:index, :show]
-  before_filter :authorize, :except => [:index]
+  before_filter :authorize, :except => [:index,:add_journal]
 
   before_filter :find_optional_project, :only => [:index]
   before_filter :check_for_default_issue_status, :only => [:new, :create]
@@ -383,6 +383,18 @@ class IssuesController < ApplicationController
     end
   end
 
+  def add_journal
+    jour = Journal.new
+    jour.user_id = User.current.id
+    jour.notes = params[:notes]
+    jour.journalized = @issue
+    jour.save
+    @user_activity_id = params[:user_activity_id]
+    respond_to do |format|
+      format.js
+    end
+  end
+
   private
 
   def find_project

app/views/issues/add_journal.js.erb

@@ -0,0 +1,3 @@
+$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/project_issue', :locals => {:activity => @issue,:user_activity_id =>@user_activity_id}) %>");
+
+init_KindEditor_data(<%= @user_activity_id%>);

app/views/users/_course_homework.html.erb

@@ -21,17 +21,10 @@
         </div>
         <div class="homepagePostDeadline">截止时间：<%= format_date(activity.end_time) %></div>
       </div>
-      <div class="homepagePostIntro break_word upload_img" id="activity_description_<%= user_activity.id%>">
+      <div class="homepagePostIntro break_word upload_img" id="activity_description_<%= user_activity_id%>">
         作业描述：<%= activity.description.html_safe %>
       </div>
-      <!--<p style="display: none" id="activity_message_<%#= user_activity.id%>">
-        <a id="expend_more_information<%#= user_activity.id%>" href="javascript:void(0)" style="color: #0781b4;" onclick="show_more_reply('#activity_description_<%#=user_activity.id%>','#expend_more_information<%#= user_activity.id%>','#arrow<%#=user_activity.id%>');"  value="show_more">[展开]</a>
-                <span class="g-arr-down">
-                    <img id="arrow<%#=user_activity.id%>" src="/images/jiantou.jpg" width="12" height="6" />
-                </span>
-
-      </p>-->
-      <div class="homepagePostSetting" style="visibility: hidden"  id="act-<%=user_activity.id %>">
+      <div class="homepagePostSetting" style="visibility: hidden"  id="act-<%=user_activity_id %>">
         <ul>
           <li class="homepagePostSettingIcon">
             <ul class="homepagePostSettiongText">

app/views/users/_course_poll.html.erb

@@ -28,8 +28,8 @@
       <div class="homepagePostDate">
         发布时间：<%= format_date(activity.published_at) %>
       </div>
-      <div class="homepagePostIntro break_word upload_img" id="activity_description_<%= user_activity.id%>">问卷描述：<%=activity.polls_description.html_safe.to_s%></div>
-      <div class="homepagePostSetting" id="act-<%= user_activity.id %>" style="visibility: hidden">
+      <div class="homepagePostIntro break_word upload_img" id="activity_description_<%= user_activity_id%>">问卷描述：<%=activity.polls_description.html_safe.to_s%></div>
+      <div class="homepagePostSetting" id="act-<%= user_activity_id %>" style="visibility: hidden">
         <ul>
           <li class="homepagePostSettingIcon">
             <ul class="homepagePostSettiongText">

app/views/users/_project_issue.html.erb

@@ -1,4 +1,4 @@
-<div class="resources mt10">
+<div class="resources mt10" id="user_activity_<%= user_activity_id%>">
   <div class="homepagePostBrief">
     <div class="homepagePostPortrait">
       <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id), :alt => "用户头像" %>
@@ -28,7 +28,7 @@
         </div>
         <div class="homepagePostDeadline">时间：<%=format_date(activity.created_on) %></div>
       </div>
-      <div class="homepagePostIntro break_word upload_img" id="activity_description_<%= user_activity.id %>">缺陷描述：
+      <div class="homepagePostIntro break_word upload_img" id="activity_description_<%= user_activity_id %>">缺陷描述：
         <% if activity.description? %>
             <%= textAreailizable activity, :description, :attachments => activity.attachments %>
         <% end %>
@@ -55,13 +55,7 @@
             <% end %>
         <% end %>
       </div>
-      <!--<div class="mt10">
-        <a href="javascript:void(0);" class="homepagePostFileAtt newsBlue">文件附件.zip</a><span class="postAttSize">(123KB)</span>
-      </div>
-      <div>
-        <a href="javascript:void(0);" class="homepagePostImageAtt newsBlue">图片附件.png</a><span class="postAttSize">(123KB)</span>
-      </div>-->
-      <div class="homepagePostSetting" id="act-<%=user_activity.id %>" style="visibility: hidden">
+      <div class="homepagePostSetting" id="act-<%=user_activity_id %>" style="visibility: hidden">
         <ul>
           <li class="homepagePostSettingIcon">
             <ul class="homepagePostSettiongText">
@@ -83,24 +77,28 @@
       <div class="homepagePostReplyBannerTime"><%#= format_date(activity.updated_on) %></div>
       <% if count>2 %>
           <div class="homepagePostReplyBannerMore">
-            <a id="reply_btn_<%= user_activity.id %>" onclick="expand_reply('#reply_div_<%= user_activity.id %> li','#reply_btn_<%=user_activity.id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help">点击展开更多回复(<%= count.to_s %>
+            <a id="reply_btn_<%= user_activity_id %>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help">点击展开更多回复(<%= count.to_s %>
               )</a></div>
       <% end %>
-      <!--<div class="homepagePostReplyBannerMore"><a href="javascript:void(0);" class="replyGrey">点击展开更多回复</a>
-      </div>-->
-    </div>
-    <!--<div class="homepagePostReplyInputContainer">
-      <textarea class="homepagePostReplyInput" placeholder="请输入回复"></textarea>
     </div>
+
     <div class="homepagePostReplyInputContainer">
-      <div class="homepagePostReplyEmotion"><a href="javascript:void(0);" class="replyGrey">表情</a></div>
-      <div class="homepagePostReplyCancel"><a href="javascript:void(0);" class="postReplyCancel">取消</a></div>
-      <div class="homepagePostReplySubmit"><a href="javascript:void(0);" class="postReplySubmit">发送</a></div>
+      <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
+        <%= form_for('new_form',:url =>  add_journal_issue_path(activity.id),:method => "post", :remote => true) do |f|%>
+            <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
+            <textarea placeholder="有问题或有建议，请直接给我留言吧！" nhname='new_message_textarea_<%= user_activity_id%>' name="notes"></textarea>
+            <p nhname='contentmsg_<%= user_activity_id%>'></p>
+            <div nhname='toolbar_container_<%= user_activity_id%>' style="float:left;padding-top:3px;"></div>
+            <a id="new_message_cancel_btn_<%= user_activity_id%>" href="javascript:void(0)" class="grey_n_btn fr  " style="margin-top:3px;">取消</a>
+            <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" class="blue_n_btn fr mr5 " style="margin-top:3px;">发送</a>
+        <% end%>
+      </div>
       <div class="cl"></div>
-    </div>-->
+    </div>
+
     <% replies_all_i = 0 %>
     <% unless activity.journals.empty? %>
-        <div class="homepagePostReplyContainer" id="reply_div_<%= user_activity.id %>">
+        <div class="homepagePostReplyContainer" id="reply_div_<%= user_activity_id %>">
           <ul>
             <% activity.journals.reorder("created_on desc").each do |reply| %>
                 <% replies_all_i=replies_all_i+1 %>

config/routes.rb

@@ -540,6 +540,9 @@ RedmineApp::Application.routes.draw do
       match 'bulk_edit', :via => [:get, :post]
       post 'bulk_update'
     end
+    member do
+      post 'add_journal'
+    end
     resources :time_entries, :controller => 'timelog' do
       collection do
         get 'report'