From f332307caeb893bc5ffbf05c38cf5ca8b4cff3c3 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Fri, 30 Dec 2016 16:12:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E8=B4=B4=E5=90=A7=E6=8F=8F?=
 =?UTF-8?q?=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/forums_controller.rb       | 13 +++++++++++++
 app/views/memos/_my_count_message.html.erb | 19 ++++++++++---------
 config/routes.rb                           |  1 +
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/app/controllers/forums_controller.rb b/app/controllers/forums_controller.rb
index a47d8ee09..057a056f3 100644
--- a/app/controllers/forums_controller.rb
+++ b/app/controllers/forums_controller.rb
@@ -271,6 +271,19 @@ class ForumsController < ApplicationController
     end
   end
 
+  # 更新贴吧描述
+  def update_memo_description
+    @forum = Forum.find(params[:id])
+    if @forum.blank?
+      result = { :result => false }
+    else
+      forum_decription = params[:forum][:description]
+      @forum.update_attributes(:description => forum_decription )
+      result = { :result => true }
+    end
+    render :json => result
+  end
+
   def search_forum
     # @forums = paginateHelper Forum.where("name LIKE '%#{params[:name]}%'")
     q = "%#{params[:name].strip}%"
diff --git a/app/views/memos/_my_count_message.html.erb b/app/views/memos/_my_count_message.html.erb
index 36c500cf0..16af682ba 100644
--- a/app/views/memos/_my_count_message.html.erb
+++ b/app/views/memos/_my_count_message.html.erb
@@ -5,7 +5,8 @@
     </div>
     <div class="fl" style="width: 120px;">
       <% user_name =  @forum.creator.show_name.empty? ? @forum.creator.name : @forum.creator.show_name %>
-      <div class="fl mb8 mt10">吧主：</div><a href="<%= user_path(@forum.creator)%>" class="linkBlue w80 fl mb8 mt10" style="overflow: hidden;white-space: nowrap;text-overflow:ellipsis; "><%= user_name %></a>
+      <div class="fl mb8 mt10">吧主：</div>
+      <a href="<%= user_path(@forum.creator)%>" target="_blank" class="linkBlue w80 fl mb8 mt10" style="overflow: hidden;white-space: nowrap;text-overflow:ellipsis; "><%= user_name %></a>
       <div class="fontGrey3 fl">回答：<a href="javascript:void(0);" class="linkOrange mr5" style="cursor: default"><%= @my_replies_count %></a> 帖子：<a href="javascript:void(0);" class="linkOrange" style="cursor: default"><%= @my_topic_count %></a></div>
     </div>
     <div class="cl"></div>
@@ -13,8 +14,9 @@
       <%= link_to @forum.name, forum_path(@forum), :class => "f16 fontBlue", :style => "word-break: break-all; word-wrap:break-word;white-space:pre-wrap;" %>
     </div>
     <div class="cl"></div>
-    <div class="fontGrey2 mt10"><span id="forum_desc_span" style="word-break:normal; width:auto; display:block; white-space:pre-wrap;word-wrap : break-word ;overflow: hidden ;"><%= @forum.description.html_safe%></span>
-      <%if @forum.creator.id == User.current.id%>
+    <div class="fontGrey2 mt10">
+      <span id="forum_desc_span" style="word-break:normal; width:auto; display:block; white-space:pre-wrap;word-wrap : break-word ;overflow: hidden ;"><%= h @forum.description.html_safe%></span>
+      <% if @forum.creator.id == User.current.id %>
           <a href="javascript:void(0);" onclick="edit_desc();">
             <%= image_tag('signature_edit.png',{:width => 12,:height => 12}) %>
           </a>
@@ -49,23 +51,22 @@
 <script>
     var desc;
     function edit_desc(){
-        if(<%= @forum.creator.id == User.current.id %>) {
             desc = $("#forum_desc_span").html();
             $("#forum_desc_span").html("<textarea id='forum_desc_input' onblur='change_forum_desc();'  style='width: 200px;height: 80px; max-width: 207px; max-height: 80px; border: 1px solid #d9d9d9;outline: none;margin: 0px 0px 12px 0px;'>" + desc + "</textarea>");
             $("#forum_desc_input").focus();
-        }
     }
 
     function change_forum_desc(){
         $.ajax({
-            url: '<%= forums_path + '/'+@forum.id.to_s+".js" %>',
-            type: 'PUT',
-            dataType: 'json',
+            url: '<%= update_memo_description_forum_path(@forum) %>',
+            type: 'post',
             data:{"forum[description]":$("#forum_desc_input").val().trim()},
             success:function(data){
-                if(data == true){
+                if(data.result == true){
+                    $("#forum_desc_input").hide();
                     $("#forum_desc_span").html($("#forum_desc_input").val().trim());
                 }else{
+                    alert("失败");
                     $("#forum_desc_span").html(desc);
                 }
             }
diff --git a/config/routes.rb b/config/routes.rb
index 0877a7a03..4c825e040 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -457,6 +457,7 @@ RedmineApp::Application.routes.draw do
     member do
       post 'create_memo'
       post 'create_feedback'
+      post 'update_memo_description'
       match 'search_memo', :via => [:get, :post]
       match 'delete_forum_tag',:via =>[:get]
       match 'add_forum_tag',:via=>[:get]