From ce89c7d1191dcc79b8ef6f49fa7af60b8c40f8f6 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 29 Jul 2015 18:26:04 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=95=99=E8=A8=80=E5=90=8E?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E7=9A=84=E5=88=B7=E6=96=B0=EF=BC=8C=E7=95=99?=
 =?UTF-8?q?=E8=A8=80=E7=9A=84=E5=88=86=E9=A1=B5=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/words_controller.rb       | 20 ++++++++++----------
 app/views/users/_user_jours_new.html.erb  |  1 +
 app/views/users/user_newfeedback.html.erb | 21 +++++++++++++--------
 config/routes.rb                          |  1 +
 4 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/app/controllers/words_controller.rb b/app/controllers/words_controller.rb
index 4b99224ca..fc723d5d5 100644
--- a/app/controllers/words_controller.rb
+++ b/app/controllers/words_controller.rb
@@ -18,17 +18,10 @@ class WordsController < ApplicationController
           list = User.find(refer_user_id).add_jour(User.current, message, refer_user_id)
         end
         @jour = list.last
-        # @user.count_new_jour
-        # if a_message.size > 5
-          # @message = a_message[-5, 5]
-        # else
-          # @message = a_message
-        # end
-        # @message_count = a_message.count
       end
     end
-    # @jours = @user.journals_for_messages.where('m_parent_id IS NULL').reverse
-    # @jour = paginateHelper @jours,10
+    jours = @user.journals_for_messages.where('m_parent_id IS NULL').order('created_on DESC')
+    @jour = paginateHelper jours,10
 
     respond_to do |format|
       format.js
@@ -91,7 +84,6 @@ class WordsController < ApplicationController
     end
     respond_to do |format|
       format.js
-      #format.api { render_api_ok }
     end
   end
 
@@ -204,7 +196,15 @@ class WordsController < ApplicationController
       flash[:error] = feedback.errors.full_messages[0]
       redirect_to project_feedback_url(params[:id])
     end
+  end
 
+  #给用户留言
+  def leave_user_message
+    @user = User.find(params[:id])
+    if params[:new_form][:user_message].size>0 && User.current.logged? && @user
+      @user.add_jour(User.current, params[:new_form][:user_message])
+    end
+    redirect_to feedback_path(@user)
   end
 
   # add by nwb
diff --git a/app/views/users/_user_jours_new.html.erb b/app/views/users/_user_jours_new.html.erb
index 81bbce319..7aa9d97ff 100644
--- a/app/views/users/_user_jours_new.html.erb
+++ b/app/views/users/_user_jours_new.html.erb
@@ -15,6 +15,7 @@
     </span>
     <div class="fr cr">
       <%= link_to l(:button_reply),'javascript:void(0);',:nhname=>"reply_btn", :class => "ml5 c_purple" %>
+
       <% if User.current.admin? || jour.user == User.current%>
           <%= link_to(l(:label_newfeedback_delete), {:controller => 'words', :action => 'destroy', :object_id => jour, :user_id => jour.user},
                       :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "ml5 c_purple", :title => l(:button_delete))  %>
diff --git a/app/views/users/user_newfeedback.html.erb b/app/views/users/user_newfeedback.html.erb
index 52fc0aaa2..d594e47e4 100644
--- a/app/views/users/user_newfeedback.html.erb
+++ b/app/views/users/user_newfeedback.html.erb
@@ -5,22 +5,27 @@
   </div>
   <div class="message_box mb10">
     <div nhname='new_message' style="display:none;">
-      <form action="<%= url_for(:controller => 'words', :action => 'create', :user_id => @user.id) %>" data-remote="true" method="post">
-        <textarea placeholder="有问题或有建议，请直接给我留言吧！" nhname='new_message_textarea' name="new_form[user_message]"></textarea>
-        <p nhname='contentmsg'></p>
-        <div nhname='toolbar_container' style="float:left;padding-top:3px;"></div>
-        <a id="new_message_cancel_btn" href="javascript:void(0)" class="grey_n_btn fr  " style="margin-top:3px;">取消</a>
-        <a id="new_message_submit_btn" href="javascript:void(0)" class="blue_n_btn fr mr5 " style="margin-top:3px;">留言</a>
-      </form>
+      <%= form_for('new_form',:url =>  leave_user_message_path(@user.id),:method => "post") do |f|%>
+          <textarea placeholder="有问题或有建议，请直接给我留言吧！" nhname='new_message_textarea' name="new_form[user_message]"></textarea>
+          <p nhname='contentmsg'></p>
+          <div nhname='toolbar_container' style="float:left;padding-top:3px;"></div>
+          <a id="new_message_cancel_btn" href="javascript:void(0)" class="grey_n_btn fr  " style="margin-top:3px;">取消</a>
+          <a id="new_message_submit_btn" href="javascript:void(0)" class="blue_n_btn fr mr5 " style="margin-top:3px;">留言</a>
+      <% end%>
     </div>
     <div class="cl"></div>
 
-    <div class="message_list_box">
+    <div class="message_list_box" id="user_jour_list">
       <%if @jour%>
           <% @jour.each do |jour|%>
               <%= render :partial => 'user_jours_new', :locals => {:jour => jour} %>
           <%end%>
       <% end%>
+
+      <ul class="wlist" style=" border:none;">
+        <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
+      </ul>
+      <div class="cl"></div>
     </div>
     <div class="cl"></div>
   </div><!--message_box end-->
diff --git a/config/routes.rb b/config/routes.rb
index 7c1096303..1536340da 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -791,6 +791,7 @@ RedmineApp::Application.routes.draw do
   match 'words/:id/leave_project_message', :to => 'words#leave_project_message'
   match 'projects/:id/feedback', :to => 'projects#feedback',  :via => :get, :as => 'project_feedback'
   match 'project/:id/share', :to => 'projects#share', :as => 'share_show' #share
+  post 'words/:id/leave_user_message', :to => 'words#leave_user_message', :as => "leave_user_message"
 
   post 'join_in/join', :to => 'courses#join', :as => 'join'
   delete 'join_in/join', :to => 'courses#unjoin'