diff --git a/app/controllers/panel/announcement/back_end/bulletins_controller.rb b/app/controllers/panel/announcement/back_end/bulletins_controller.rb index de369ee..9cf810b 100644 --- a/app/controllers/panel/announcement/back_end/bulletins_controller.rb +++ b/app/controllers/panel/announcement/back_end/bulletins_controller.rb @@ -65,6 +65,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController # GET /bulletins/1/edit def edit @bulletin = Bulletin.find(params[:id]) + @users = @bulletin.get_users @tags = get_tags is_authorized_sub_manager = @bulletin.category.auth_sub_manager.authorized_user_ids rescue nil diff --git a/app/models/bulletin.rb b/app/models/bulletin.rb index 77fa12b..ffbdd24 100644 --- a/app/models/bulletin.rb +++ b/app/models/bulletin.rb @@ -24,10 +24,13 @@ class Bulletin field :create_user_id field :update_user_id, :class_name => "User" + field :user_ids field :view_count, :type => Integer, :default => 0 field :public, :type => Boolean, :default => true + field :rss_link + mount_uploader :image, ImageUploader @@ -149,6 +152,9 @@ class Bulletin preview_object end + def get_users + User.find(self.user_ids) rescue [] + end protected diff --git a/app/views/panel/announcement/back_end/bulletins/_form.html.erb b/app/views/panel/announcement/back_end/bulletins/_form.html.erb index 1273075..ab11985 100644 --- a/app/views/panel/announcement/back_end/bulletins/_form.html.erb +++ b/app/views/panel/announcement/back_end/bulletins/_form.html.erb @@ -64,6 +64,14 @@ <%= f.datetime_picker :deadline, :no_label => true %> + + +