From 09f0d0201eb731462daca693fa28eef04abf503d Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Wed, 9 Dec 2015 09:23:22 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=A2=9E=E5=8A=A0=E6=A0=8F?=
 =?UTF-8?q?=E7=9B=AE=E5=8F=91=E5=B8=96=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org_document_comments_controller.rb       |  9 +++-
 app/models/org_subfield.rb                    |  1 +
 app/views/org_document_comments/new.html.erb  | 45 +++++++++++++------
 .../_org_left_subfield_list.html.erb          |  2 +-
 .../organizations/_show_org_document.html.erb |  2 +-
 ...20151208073241_add_subfield_to_document.rb |  5 +++
 6 files changed, 47 insertions(+), 17 deletions(-)
 create mode 100644 db/migrate/20151208073241_add_subfield_to_document.rb

diff --git a/app/controllers/org_document_comments_controller.rb b/app/controllers/org_document_comments_controller.rb
index 29b728268..e9f3d47fb 100644
--- a/app/controllers/org_document_comments_controller.rb
+++ b/app/controllers/org_document_comments_controller.rb
@@ -11,10 +11,17 @@ class OrgDocumentCommentsController < ApplicationController
     @org_document_comment = OrgDocumentComment.new(:organization_id => @organization.id, :creator_id => User.current.id)
     @org_document_comment.title = params[:org_document_comment][:title]
     @org_document_comment.content = params[:org_document_comment][:content]
+    if params[:field_id]
+      @org_document_comment.org_subfield_id = params[:field_id].to_i
+    end
     if @org_document_comment.save
       flash.keep[:notice] = l(:notice_successful_create)
       EditorOfDocument.create(:editor_id => User.current.id, :org_document_comment_id => @org_document_comment.id, :created_at => @org_document_comment.updated_at)
-      redirect_to organization_org_document_comments_path(@organization)
+      if params[:field_id]
+        redirect_to organization_path(@organization)
+      else
+        redirect_to organization_org_document_comments_path(@organization)
+      end
     else
       redirect_to new_org_document_comment_path(:organization_id => @organization.id)
     end
diff --git a/app/models/org_subfield.rb b/app/models/org_subfield.rb
index 1660310f8..087120b69 100644
--- a/app/models/org_subfield.rb
+++ b/app/models/org_subfield.rb
@@ -1,3 +1,4 @@
 class OrgSubfield < ActiveRecord::Base
   belongs_to :organization, :foreign_key => :organization_id
+  has_many :org_document_comments
 end
\ No newline at end of file
diff --git a/app/views/org_document_comments/new.html.erb b/app/views/org_document_comments/new.html.erb
index 11a7e9359..9150be608 100644
--- a/app/views/org_document_comments/new.html.erb
+++ b/app/views/org_document_comments/new.html.erb
@@ -1,24 +1,41 @@
 <%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'%>
 <script>
-  function check_org_title(title)
-  {
-      if($("#document_title").val().trim() == "")
-      {
-          $("#doc_title_hint").html("<span class='c_red'>标题不能为空</span>").show();
-      }
-      else
-      {
-          $("#doc_title_hint").hide();
-      }
-  }
+    function check_org_title()
+    {
+        if($("#document_title").val().trim() == "")
+        {
+            $("#doc_title_hint").html("<span class='c_red'>标题不能为空</span>").show();
+            return false;
+        }
+        else
+        {
+            $("#doc_title_hint").hide();
+            return true;
+        }
+    }
+    function create_org_document()
+    {
+        if(check_org_title() == true)
+        {
+            org_document_description_editor.sync();
+            $('#new_org_document_form').submit();
+        }
+    }
+    function cancel_create_org_document(){
+        $("#document_title").val("");
+        org_document_description_editor.html("");
+        org_document_description_editor.sync();
+        $('#org_document_editor').hide();
+        $('#doc_title_hint').hide();
+    }
 </script>
-<%= form_tag organization_org_document_comments_path(:organization_id => @organization.id), :id => 'new_org_document_form' do |f| %>
+<%= form_tag organization_org_document_comments_path(:organization_id => @organization.id, :field_id => params[:field_id]), :id => 'new_org_document_form' do |f| %>
 <div class="resources">
       <div>
         <textarea class="postDetailInput fl mr15" style="margin-bottom:15px;" name="org_document_comment[title]" id="document_title" style="resize:none;" onfocus = "$('#org_document_editor').show();" onblur="check_org_title();" placeholder="请输入文章标题"></textarea>
       </div>
       <div id="doc_title_hint"></div>
-    <div id="org_document_editor" class="mt15" style="display: none">
+    <div id="org_document_editor" class="mt15" >
       <div class="mt10">
         <%= kindeditor_tag 'org_document_comment[content]','', :editor_id => 'org_document_description_editor', :height => "150px" %>
       </div>
@@ -29,7 +46,7 @@
       <div class="cl"></div>
 
       <div class="mt5">
-            <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="org_document_description_editor.sync();$('#new_org_document_form').submit();">确定</a>
+            <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="create_org_document();">确定</a>
             <span class="fr mr10 mt3">或</span>
             <a href="javascript:void(0);" onclick="$('#org_document_editor').hide(); $('#doc_title_hint').hide();" class="fr mr10 mt3">取消</a>
         <div class="cl"></div>
diff --git a/app/views/organizations/_org_left_subfield_list.html.erb b/app/views/organizations/_org_left_subfield_list.html.erb
index cb604f6ba..f2329e2be 100644
--- a/app/views/organizations/_org_left_subfield_list.html.erb
+++ b/app/views/organizations/_org_left_subfield_list.html.erb
@@ -26,7 +26,7 @@
 <% organization.org_subfields.each do |field| %>
     <div class="homepageLeftMenuBlock">
       <a href="javascript:void(0);" class="homepageMenuText" onclick="$('#homepageLeftMenuCourses_#{field.id}').slideToggle();"><%= field.name %></a>
-      <%=link_to "", :title => "关联#{field.name}"%>
+      <%=link_to "", new_organization_org_document_comment_path(organization, :field_id => field.id), :method => "get", :class => "homepageMenuSetting fr", :title => "发布帖子"%>
     </div>
     <div class="homepageLeftMenuCourses" id="homepageLeftMenuField_<%= field.id %>" style="display:none;">
     </div>
diff --git a/app/views/organizations/_show_org_document.html.erb b/app/views/organizations/_show_org_document.html.erb
index f2c635e90..ed13dfe8a 100644
--- a/app/views/organizations/_show_org_document.html.erb
+++ b/app/views/organizations/_show_org_document.html.erb
@@ -8,7 +8,7 @@
         <%= link_to User.find(document.creator_id), user_path(document.creator.id), :class => "newsBlue mr15" %>
         TO&nbsp;&nbsp;<%= link_to document.organization.name, organization_path(document.organization), :class => "newsBlue" %>
         |
-            <span style="color:#269ac9;">组织文章</span>
+            <span style="color:#269ac9;"><%= document.org_subfield_id.nil? ? "组织文章" :"#{OrgSubfield.find(document.org_subfield_id).name}" %></span>
       </div>
       <div class="homepagePostTitle postGrey"><%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id) %></div>
       <div class="homepagePostDate">
diff --git a/db/migrate/20151208073241_add_subfield_to_document.rb b/db/migrate/20151208073241_add_subfield_to_document.rb
new file mode 100644
index 000000000..b070a9cec
--- /dev/null
+++ b/db/migrate/20151208073241_add_subfield_to_document.rb
@@ -0,0 +1,5 @@
+class AddSubfieldToDocument < ActiveRecord::Migration
+  def change
+    add_column :org_document_comments, :org_subfield_id, :integer
+  end
+end