From 0c53aed51035bbea373338a1e9f4ba183d3b3ce9 Mon Sep 17 00:00:00 2001 From: Bohung Date: Wed, 23 Mar 2022 21:27:35 +0800 Subject: [PATCH] Fix bug. --- app/controllers/admin/announcements_controller.rb | 2 ++ app/models/bulletin.rb | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/admin/announcements_controller.rb b/app/controllers/admin/announcements_controller.rb index 873eac0..7280693 100644 --- a/app/controllers/admin/announcements_controller.rb +++ b/app/controllers/admin/announcements_controller.rb @@ -327,7 +327,9 @@ class Admin::AnnouncementsController < OrbitAdminController Bulletin.where(:copy_id=>bulletin.id.to_s).destroy bulletin.is_edit = true bulletin.save + set_approved = bulletin.is_preview bulletin = bulletin.get_org_model + bulletin.approved = true if set_approved bps = bulletin_params bps[:tags] = bps[:tags].blank? ? [] : bps[:tags] bps[:email_member_ids] = bps[:email_member_ids].blank? ? [] : bps[:email_member_ids] diff --git a/app/models/bulletin.rb b/app/models/bulletin.rb index f514003..af4886c 100644 --- a/app/models/bulletin.rb +++ b/app/models/bulletin.rb @@ -114,8 +114,6 @@ class Bulletin org_model = nil if self.copy_id org_model = self.class.find(self.copy_id) rescue nil - else - org_model = self.class.where(:title=>self.title,:is_preview.ne=>true).desc(:updated_at).first end org_model.nil? ? self : org_model else