merge fix bug #14
			
				
			
		
		
		
	| 
						 | 
				
			
			@ -69,6 +69,7 @@ class SeminarSignup
 | 
			
		|||
          sr.save
 | 
			
		||||
        end
 | 
			
		||||
      end
 | 
			
		||||
      seminar_main.seminar_signups.delete(self) #avoid resave 
 | 
			
		||||
      if seminar_main.unassigned_seminar_signup_ids.delete(id)
 | 
			
		||||
        seminar_main.save
 | 
			
		||||
      end
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -98,7 +98,10 @@ class CustomAnnouncementsController < ApplicationController
 | 
			
		|||
  def self.custom_widget_data
 | 
			
		||||
    @custom_configs = CustomBulletinConfig.all.to_a
 | 
			
		||||
    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
 | 
			
		||||
  def random_custom_announcement_widget
 | 
			
		||||
    pack_data(true)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -133,7 +133,10 @@ class CustomGalleriesController < ApplicationController
 | 
			
		|||
  def self.custom_widget_data
 | 
			
		||||
    @custom_configs = CustomAlbumConfig.all.to_a
 | 
			
		||||
    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
 | 
			
		||||
  def custom_album_widget
 | 
			
		||||
    @custom_album_setting = CustomAlbumSetting.first
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue