文章点击500问题

This commit is contained in:
huang 2016-06-08 11:23:16 +08:00
parent a138ee31ab
commit 2f9dcc8a31
2 changed files with 2 additions and 2 deletions

View File

@ -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

View File

@ -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' %>