From 35b543cd22ad41fb7cd8e2c562f2901bf1d757f0 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Tue, 1 Dec 2015 17:23:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BA=E5=9D=9B=E5=8F=91=E5=B8=96=20?=
 =?UTF-8?q?=E9=87=87=E7=94=A8ajax=E6=8F=90=E4=BA=A4=E3=80=82=E8=BF=99?=
 =?UTF-8?q?=E6=A0=B7=E5=AD=90=E7=BD=91=E7=BB=9C=E4=B8=8D=E5=A5=BD=E7=9A=84?=
 =?UTF-8?q?=E6=83=85=E5=86=B5=E5=B0=B1=E4=B8=8D=E4=BC=9A=E4=B8=A2=E5=A4=B1?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=BA=86=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/memos_controller.rb    |  6 +++++-
 app/views/forums/show.html.erb         | 18 ++++++++++++++++--
 app/views/layouts/base_forums.html.erb |  2 +-
 app/views/memos/create.js.erb          |  1 +
 app/views/memos/edit.html.erb          | 16 +++++++++++++++-
 app/views/memos/update.js.erb          |  5 +++++
 6 files changed, 43 insertions(+), 5 deletions(-)
 create mode 100644 app/views/memos/create.js.erb
 create mode 100644 app/views/memos/update.js.erb

diff --git a/app/controllers/memos_controller.rb b/app/controllers/memos_controller.rb
index 4181090a5..2d2c058d4 100644
--- a/app/controllers/memos_controller.rb
+++ b/app/controllers/memos_controller.rb
@@ -73,6 +73,7 @@ class MemosController < ApplicationController
           end
         end
         #end
+          format.js
           format.html { redirect_to back_memo_url, notice: "#{l :label_memo_create_succ}" }
           format.json { render json: @memo, status: :created, location: @memo }
       else
@@ -152,6 +153,7 @@ class MemosController < ApplicationController
   end
 
   def update
+    @flag = false
     respond_to do |format|
       if( #@memo.update_column(:subject, params[:memo][:subject]) &&
            @memo.update_column(:content, params[:memo][:content]) &&
@@ -159,10 +161,12 @@ class MemosController < ApplicationController
            @memo.update_column(:lock, params[:memo][:lock]) &&
            @memo.update_column(:subject,params[:memo][:subject]))
         @memo.save_attachments(params[:attachments] || (params[:memo] && params[:memo][:uploads]))
-        @memo.save
+        @flag = @memo.save
         # @memo.root.update_attribute(:updated_at, @memo.updated_at)
+        format.js
         format.html {redirect_to back_memo_url, notice: "#{l :label_memo_create_succ}"}
       else
+        format.js
         format.html { render action: "edit" }
         format.json { render json: @person.errors, status: :unprocessable_entity }
       end
diff --git a/app/views/forums/show.html.erb b/app/views/forums/show.html.erb
index 05c086ed4..ad9195804 100644
--- a/app/views/forums/show.html.erb
+++ b/app/views/forums/show.html.erb
@@ -3,7 +3,7 @@
 <div class="postRightContainer">
   <div id="create_memo_div" style="display: none">
     <div id="error" class="red fl mb10" style="display: none">error</div>
-    <%= labelled_form_for(@memo, :url => forum_memos_path(@forum)) do |f|  %>
+    <%= labelled_form_for(@memo, :url => forum_memos_path(@forum),:remote=>true) do |f|  %>
     <div>
       <textarea type="text" name="memo[subject]" id="memo_subject" maxlength="50" onblur="check_memo_name();" onfocus="$('#error').hide();" onmouseover="this.style.borderColor='#d9d9d9'" class="postDetailInput" placeholder="输入帖子标题"  ></textarea>
       <script>
@@ -112,7 +112,21 @@
         }
         if($("textarea[name='memo[subject]']").val().trim() != "" && !memo_content.isEmpty() ){
             memo_content.sync();
-            $("#new_memo").submit();
+            $.ajax({
+                url:'/forums/'+'<%= @forum.id.to_s%>'+'/memos',
+                type:'post',
+                data:{
+                    'memo[content]':$("#memo_content").val(),
+                    'memo[subject]':$("#memo_subject").val()
+                },
+                success:function(data){
+
+                },
+                error:function(){
+                    alert('请检查当前网络连接')
+                }
+            });
+            //$("#new_memo").submit();
         }else if($("textarea[name='memo[subject]']").val().trim() == "" && memo_content.isEmpty()){
             $("#error").html("主题和内容不能为空").show();
         }
diff --git a/app/views/layouts/base_forums.html.erb b/app/views/layouts/base_forums.html.erb
index eb24c0a6e..3526f869a 100644
--- a/app/views/layouts/base_forums.html.erb
+++ b/app/views/layouts/base_forums.html.erb
@@ -9,7 +9,7 @@
 		<%= favicon %>
 		<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','application','prettify', 'nyan','leftside', :media => 'all' %>
 		<%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
-		<%= javascript_heads %>
+		<%= javascript_include_tag('jquery-1.8.3-ui-1.9.2-ujs-2.0.3', 'application', 'jquery.colorbox-min') %>
     <%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' ,'prettify' %>
 		<%= heads_for_theme %>
 
diff --git a/app/views/memos/create.js.erb b/app/views/memos/create.js.erb
new file mode 100644
index 000000000..410c82d79
--- /dev/null
+++ b/app/views/memos/create.js.erb
@@ -0,0 +1 @@
+window.location.href='<%= forum_memo_path(:forum_id=>@memo.forum_id,:id=>@memo.id ) %>'
\ No newline at end of file
diff --git a/app/views/memos/edit.html.erb b/app/views/memos/edit.html.erb
index cace5bcc8..56e3a96b3 100644
--- a/app/views/memos/edit.html.erb
+++ b/app/views/memos/edit.html.erb
@@ -13,7 +13,21 @@
               return false;
           }
           memo_content.sync();
-          $("#edit_memo").submit();
+          $.ajax({
+              url:' /forums/'+'<%= @memo.forum_id.to_s %>'+'/memos/<%= @memo.id.to_s%>',
+              type:'put',
+              data:{
+                'memo[subject]':$("#memo_subject").val(),
+                 'memo[content]':$("#memo_content").val()
+              },
+              success:function(data){
+
+              },
+              error:function(){
+                  alert('请检查当前网络连接')
+              }
+          });
+          //$("#edit_memo").submit();
       }else if($("textarea[name='memo[subject]']").val().trim() == "" && !memo_content.isEmpty() ){
           $("#error").html("主题不能为空").show();
       }else if($("textarea[name='memo[subject]']").val().trim() != "" && memo_content.isEmpty()){
diff --git a/app/views/memos/update.js.erb b/app/views/memos/update.js.erb
new file mode 100644
index 000000000..ddd192044
--- /dev/null
+++ b/app/views/memos/update.js.erb
@@ -0,0 +1,5 @@
+<% if  @flag%>
+window.location.href='<%= forum_memo_path(:forum_id=>@memo.forum_id,:id=>@memo.id ) %>'
+<%else%>
+$("#error").html('内容填写存在错误');
+<% end %>
\ No newline at end of file