issue回复

2015-12-17 18:12:38 +08:00 · 2015-12-17 18:12:38 +08:00 · 8ce2dbc4b8
parent 1dbccd81d6
commit 8ce2dbc4b8
9 changed files with 74 additions and 9 deletions
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@ -430,9 +430,32 @@ class IssuesController < ApplicationController
    end
  end

-  #对某个journ回复
+  #对某个journ回复,显示回复框
  def reply
+    @issue = Issue.find(params[:id])
+    @jour = Journal.find(params[:journal_id])
+    @tempContent = "<blockquote>#{ll(Setting.default_language, :text_user_wrote, @jour.user.realname.blank? ?  @jour.user.login: @jour.user.realname)} <br/>#{@jour.notes.html_safe}</blockquote>".html_safe
+    respond_to do |format|
+      format.js
+    end
+  end

+  #给issue添加journ。回复内容包含 对某个被回复的journ的内容
+  def add_reply
+    if User.current.logged?
+      jour = Journal.new
+      jour.user_id = User.current.id
+      jour.notes = params[:quote]+params[:notes]
+      @issue = Issue.find params[:id]
+      jour.journalized = @issue
+      jour.save
+      user_activity = UserActivity.where("act_type='Issue' and act_id =#{@issue.id}").first
+      user_activity.updated_at = jour.created_on
+      user_activity.save
+      respond_to do |format|
+        format.js
+      end
+    end
  end

  #
--- a/app/views/issues/_issue_replies.html.erb
+++ b/app/views/issues/_issue_replies.html.erb
@ -28,6 +28,7 @@
            <P><%= reply.notes.html_safe %></P>
          </div>
          <div style="margin-top: 7px">
+            <%= format_time(reply.created_on) %>
            <div class="fr" id="reply_edit_menu_<%= reply.id%>" style="display: none">
              <%= link_to(
                          l(:button_reply),
@ -47,6 +48,7 @@
                  ) if reply.user_id == User.current.id %>
            </div>
          </div>
+          <p id="reply_message_<%= reply.id%>"></p>
        </div>
        <div class="cl"></div>
      </li>
@ -76,4 +78,5 @@
    <!--<a href="javascript:void(0);" onclick="issues_reply_editor.sync();$(this).parent().submit();" class="homepagePostReplySubmit postReplySubmit fl mt5">发送</a>-->
    <div class="cl"></div>

-  </div>
+  </div>
+</div>
--- a/app/views/issues/_issue_reply_ke_form.html.erb
+++ b/app/views/issues/_issue_reply_ke_form.html.erb
@ -0,0 +1,27 @@
+<div class="ReplyToMessageContainer borderBottomNone " id="reply_to_message_<%= @issue.id%>">
+
+  <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= @issue.id%>">
+    <%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(@issue.author_id), :alt => "用户头像" %>
+  </div>
+
+  <div class="ReplyToMessageInputContainer mb10">
+    <div nhname='new_message_<%= @issue.id%>' style="display:none;">
+      <%= form_for('new_form',:url =>  add_reply_issue_path(@issue.id),:method => "post", :remote => true) do |f|%>
+          <%#= kindeditor_tag :notes,"",:height=>"33",:minHeight=>"33",:editor_id=>"issues_reply_editor"%>
+          <!--<div class="cl"></div>-->
+          <input type="hidden" name="quote" value=""/>
+          <input type="hidden" name="issue_id" value="<%=@issue.id%>"/>
+          <div nhname='toolbar_container_<%= @issue.id%>' ></div>
+          <div class="cl"></div>
+          <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= @issue.id%>' name="notes"></textarea>
+          <div class="cl"></div>
+          <span nhname='contentmsg_<%= @issue.id%>' class="fl"></span>
+          <a id="new_message_submit_btn_<%= @issue.id%>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+          <div class="cl"></div>
+      <% end %>
+    </div>
+    <!--<a href="javascript:void(0);" onclick="issues_reply_editor.sync();$(this).parent().submit();" class="homepagePostReplySubmit postReplySubmit fl mt5">发送</a>-->
+    <div class="cl"></div>
+
+  </div>
+</div>
--- a/app/views/issues/add_reply.js.erb
+++ b/app/views/issues/add_reply.js.erb
@ -0,0 +1,3 @@
+$("#reply_div_<%= @issue.id %>").html("<%=  escape_javascript(render :partial => 'issues/issue_replies', :locals => {:issue => @issue,:replies_all_i=>0}) %>");
+$(".homepagePostReplyBannerCount").html('回复(<%= Issue.find( @issue).journals.count %>)')
+sd_create_editor_from_data(<%= @issue.id%>, null, "100%");
--- a/app/views/issues/reply.js.erb
+++ b/app/views/issues/reply.js.erb
@ -0,0 +1,9 @@
+if($("#reply_message_<%= @jour.id%>").length > 0) {
+    $("#reply_message_<%= @jour.id%>").replaceWith("<%= escape_javascript(render :partial => 'issues/issue_reply_ke_form') %>");
+    $(function(){
+        $('input[name=quote]').val("<%= raw escape_javascript(@tempContent.html_safe) %>");
+        sd_create_editor_from_data(<%= @issue.id%>, null, "100%");
+    });
+}else if($("#reply_to_message_<%= @issue.id%>").length >0) {
+    $("#reply_to_message_<%= @issue.id%>").replaceWith("<p id='reply_message_<%= @jour.id%>'></p>");
+}
--- a/config/routes.rb
+++ b/config/routes.rb
@ -706,7 +706,8 @@ RedmineApp::Application.routes.draw do
      post 'add_journal'
      post 'add_journal_in_org'
      get 'delete_journal'
-      post 'reply'
+      get 'reply'
+      post 'add_reply'
    end
    resources :time_entries, :controller => 'timelog' do
      collection do
--- a/public/javascripts/create_kindeditor.js
+++ b/public/javascripts/create_kindeditor.js
@ -18,9 +18,6 @@ function sd_create_editor(params){
            var edit = this.edit;
            var body = edit.doc.body;
            edit.iframe.height(paramsHeight);
-            console.log(" body.scrollHeight "+ body.scrollHeight)
-            console.log(" body.offsetHeight "+ body.offsetHeight)
-            console.log("(params.kindutil.IE ? body.scrollHeight : body.offsetHeight)"+(params.kindutil.IE ? body.scrollHeight : body.offsetHeight))
            this.resize(null, Math.max((params.kindutil.IE ? body.scrollHeight : (params.kindutil.GECKO ? body.offsetHeight+26:body.offsetHeight))  , paramsHeight));
        },
        afterBlur:function(){
@ -34,7 +31,7 @@ function sd_create_editor(params){
            if(/^\s*<\w*\s*\w*\=\"\w*\"\s*\w*\=\"\w*\:\s*\#\d*\;\s*\w*\-\w*\:\s*\w*\;\"\>[\u4e00-\u9fa5]*<\/\w*\>\s*$/.test(this.edit.html())){
                params.submit_btn.hide();
                params.toolbar_container.hide();
-                this.resize("94%", null);
+                this.resize("100%", null);
            }else if(this.edit.html().trim() != ""){
                params.submit_btn.show();
                params.toolbar_container.show();
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@ -1328,7 +1328,7 @@ a:hover.link_file_a{ background:url(../images/pic_file.png) 0 -25px no-repeat; c
 .ul_normal_color li {list-style-position:inside; padding-left:1px; list-style-image:url('../images/news_dot.png')}
 span.author { font-size: 0.9em; color: #888; }
 .ReplyToMessageInputContainer {width: 582px;float: left;}
-
+.ReplyToMessageContainer {border-bottom:1px solid #e3e3e3; width:632px; margin:0px auto; margin-top:15px; min-height:60px;}
 /*全站搜索*/
 .blocks {padding:15px; background-color:#ffffff; border:1px solid #dddddd;}
 #searchBanner {border-bottom:1px solid #d0d0d0;}
--- a/public/stylesheets/project.css
+++ b/public/stylesheets/project.css
@ -1082,4 +1082,6 @@ img.date-trigger {

 a.link_file_a{ background:url(../images/pic_file.png) 0 2px no-repeat; padding-left:20px; }
 a:hover.link_file_a{ background:url(../images/pic_file.png) 0 -25px no-repeat; color:#3ca5c6;}
-.imageFuzzy {filter:alpha(opacity=50); -moz-opacity:0.5; -khtml-opacity:0.5;opacity: 0.5;}
+.imageFuzzy {filter:alpha(opacity=50); -moz-opacity:0.5; -khtml-opacity:0.5;opacity: 0.5;}
+.ReplyToMessageInputContainer {width: 582px;float: left;}
+.ReplyToMessageContainer {border-bottom:1px solid #e3e3e3; width:632px; margin:0px auto; margin-top:15px; min-height:60px;}