From 2f9dcc8a31c8bc51a04be0a5549feb623b1eb356 Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 8 Jun 2016 11:23:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E7=AB=A0=E7=82=B9=E5=87=BB500?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/org_document_comments_controller.rb | 2 +- app/views/org_document_comments/show.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/org_document_comments_controller.rb b/app/controllers/org_document_comments_controller.rb index 1b9280749..264c1fc9f 100644 --- a/app/controllers/org_document_comments_controller.rb +++ b/app/controllers/org_document_comments_controller.rb @@ -41,7 +41,7 @@ class OrgDocumentCommentsController < ApplicationController @org_subfield = OrgSubfield.where(:id => @document.org_subfield_id).first @subfield_content = @organization.org_subfields.order("priority") respond_to do |format| - format.html {render :layout => @organization.switch_type ? 'base_org_custom' : 'base_org'} + format.html {render :layout => (@organization.switch_type && @document && !@document.org_subfield_id.blank?) ? 'base_org_custom' : 'base_org'} end end diff --git a/app/views/org_document_comments/show.html.erb b/app/views/org_document_comments/show.html.erb index dbeabfa72..bcb1a61ef 100644 --- a/app/views/org_document_comments/show.html.erb +++ b/app/views/org_document_comments/show.html.erb @@ -1,4 +1,4 @@ -<% if @organization.switch_type %> +<% if @organization.switch_type && @document && !@document.org_subfield_id.blank? %> <%= render :partial => 'show_custom_org_document_comment' %> <% else %> <%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"create_kindeditor",'blog' %>