chiu
/
custom_announcement
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated.

This commit is contained in:
BoHung Chiu 2023-07-05 09:25:00 +08:00
parent ca1a85929d
commit 6d14f05e15
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/admin/custom_announcements_controller.rb
View File

@ -38,7 +38,7 @@ class Admin::CustomAnnouncementsController < OrbitAdminController
if current_user_is_sub_manager if current_user_is_sub_manager
@categories = current_user.approved_categories.select{|c| c.module_app_id == @module_app.id} rescue [] @categories = current_user.approved_categories.select{|c| c.module_app_id == @module_app.id} rescue []
@filter_fields = filter_fields(@categories, @tags) @filter_fields = filter_fields(@categories, @tags)
@custom_bulletins = CustomBulletin.where(:create_user_id=>current_user.id,:title.ne => "",:is_preview.in=>[false,nil]) @custom_bulletins = CustomBulletin.where(:create_user_id=>current_user.id,:is_preview.in=>[false,nil])
.order_by(sort) .order_by(sort)
.with_categories(filters("category")) .with_categories(filters("category"))
.with_tags(filters("tag")) .with_tags(filters("tag"))
@ -51,7 +51,7 @@ class Admin::CustomAnnouncementsController < OrbitAdminController
else else
@categories = @module_app.categories.enabled @categories = @module_app.categories.enabled
@filter_fields = filter_fields(@categories, @tags) @filter_fields = filter_fields(@categories, @tags)
@custom_bulletins = CustomBulletin.where(:title.ne => "",:is_preview.in=>[false,nil]) @custom_bulletins = CustomBulletin.where(:is_preview.in=>[false,nil])
.order_by(sort) .order_by(sort)
.with_categories(filters("category")) .with_categories(filters("category"))
.with_tags(filters("tag")) .with_tags(filters("tag"))

5
app/controllers/custom_announcements_controller.rb
View File

@ -98,7 +98,10 @@ class CustomAnnouncementsController < ApplicationController
def self.custom_widget_data def self.custom_widget_data
@custom_configs = CustomBulletinConfig.all.to_a @custom_configs = CustomBulletinConfig.all.to_a
ac = ActionController::Base.new ac = ActionController::Base.new
ac.render_to_string("custom_announcements/custom_widget_data",:locals=>{:@custom_data_field=>@custom_data_field,:@custom_configs=>@custom_configs,:@field_name=>@field_name}) ac.instance_variable_set(:@custom_data_field, @custom_data_field)
ac.instance_variable_set(:@custom_configs, @custom_configs)
ac.instance_variable_set(:@field_name, @field_name)
ac.render_to_string("custom_announcements/custom_widget_data")
end end
def random_custom_announcement_widget def random_custom_announcement_widget
pack_data(true) pack_data(true)

2
app/models/custom_bulletin.rb
View File

@ -98,7 +98,7 @@ class CustomBulletin
target_model = custom_bulletin_config.bind_model.constantize rescue nil target_model = custom_bulletin_config.bind_model.constantize rescue nil
if target_model if target_model
target_record = target_model.where(custom_bulletin_config.uid_field=>self.bind_uid).first target_record = target_model.where(custom_bulletin_config.uid_field=>self.bind_uid).first
target_record.send(custom_bulletin_config.custom_record_callback,num) target_record.send(custom_bulletin_config.custom_record_callback,num) if target_record
end end
end end
end end