123
/
seminar
forked from spen/seminar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'merge fix bug' (#14) from 123/seminar:master into master 

Reviewed-on: https://gitlab.tp.rulingcom.com/spen/seminar/pulls/14
This commit is contained in:
chiu 2023-09-27 09:21:06 +00:00
parent 78012b43f2 639fdd888c
commit dd935ebf89
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/models/seminar_signup.rb
View File

@ -69,6 +69,7 @@ class SeminarSignup
sr.save sr.save
end end
end end
seminar_main.seminar_signups.delete(self) #avoid resave
if seminar_main.unassigned_seminar_signup_ids.delete(id) if seminar_main.unassigned_seminar_signup_ids.delete(id)
seminar_main.save seminar_main.save
end end

5
custom_announcement/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)

5
custom_gallery/app/controllers/custom_galleries_controller.rb
View File

@ -133,7 +133,10 @@ class CustomGalleriesController < ApplicationController
def self.custom_widget_data def self.custom_widget_data
@custom_configs = CustomAlbumConfig.all.to_a @custom_configs = CustomAlbumConfig.all.to_a
ac = ActionController::Base.new ac = ActionController::Base.new
ac.render_to_string("custom_galleries/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_galleries/custom_widget_data")
end end
def custom_album_widget def custom_album_widget
@custom_album_setting = CustomAlbumSetting.first @custom_album_setting = CustomAlbumSetting.first