kikiwww
/
forgeplus
forked from Trustie/forgeplus
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed topic功能合并,名称调整

This commit is contained in:
xxq250 2025-05-17 16:41:51 +08:00
parent 8be5be6a90
commit bce5fddeb9
2 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/topic.rb
View File

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

22
app/views/admins/topics/_form_modal_forums.html.erb
View File

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