From bce5fddeb9a287c9919ba6893f54cb404a39beaf Mon Sep 17 00:00:00 2001
From: xxq250 <xxq250@qq.com>
Date: Sat, 17 May 2025 16:41:51 +0800
Subject: [PATCH] =?UTF-8?q?fixed=20topic=E5=8A=9F=E8=83=BD=E5=90=88?=
 =?UTF-8?q?=E5=B9=B6,=E5=90=8D=E7=A7=B0=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/topic.rb                           |  2 +-
 .../admins/topics/_form_modal_forums.html.erb | 22 +------------------
 2 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/app/models/topic.rb b/app/models/topic.rb
index 0bd831473..94b0e53fd 100644
--- a/app/models/topic.rb
+++ b/app/models/topic.rb
@@ -19,7 +19,7 @@ class Topic < ApplicationRecord
 
   scope :with_single_type, ->(type){where(type: trans_simpletype_to_classtype(type))}
   scope :with_mutil_type, ->(type){where(type: group_class_type_names(type))}
-  self.inheritance_column = nil
+  # self.inheritance_column = nil
 
   def self.has_templates?(type)
     type_simple_name = Topic.type_simple_name(type)
diff --git a/app/views/admins/topics/_form_modal_forums.html.erb b/app/views/admins/topics/_form_modal_forums.html.erb
index 6f663246e..c444abd24 100644
--- a/app/views/admins/topics/_form_modal_forums.html.erb
+++ b/app/views/admins/topics/_form_modal_forums.html.erb
@@ -39,27 +39,7 @@
             </label>
             <%= p.number_field :order_index, class: "form-control", placeholder: "" %>
           </div>
-          <div class="logo-item">
-            <% logo_img = @topic.image %>
-            <% if logo_img.present? %>
-              <div class="logo-item-left mr-3 <%= logo_img ? 'has-img' : '' %>">
-                <img class="logo-item-img nav-logo-img" src="<%= logo_img %>" style="<%= logo_img.present? ? '' : 'display: none' %>"/>
-                <%= file_field_tag(:image, accept: 'image/png,image/jpg,image/jpeg', style: "opacity: 0", value: params[:image]) %>
-                <label for="image" class="logo-item-upload" data-toggle="tooltip" data-title="选择图片"></label>
-              </div>
-            <% else %>
-              <div class="logo-item-left mr-3 <%= logo_img ? 'has-img' : '' %>">
-                <img class="logo-item-img nav-logo-img" src="<%= logo_img %>" style="<%= logo_img.present? ? '' : 'display: none' %>"/>
-                <%= file_field_tag(:image, accept: 'image/png,image/jpg,image/jpeg', required: true, style: "opacity: 0", value: params[:image]) %>
-                <label for="image" class="logo-item-upload" data-toggle="tooltip" data-title="选择图片"></label>
-              </div>
-            <% end %>
-            <div class="logo-item-right">
-              <div class="logo-item-title flex-1">logo<span class="ml10 color-orange mr20">*</span></div>
-              <div>格式：PNG、JPG</div>
-              <div>尺寸：高度38px以内，宽等比例缩放</div>
-            </div>
-          </div>
+
         </div>
         <div class="modal-footer">
           <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>