diff --git a/app/controllers/event_news_mods_controller.rb b/app/controllers/event_news_mods_controller.rb index 4d3584c..3e0481b 100644 --- a/app/controllers/event_news_mods_controller.rb +++ b/app/controllers/event_news_mods_controller.rb @@ -678,9 +678,19 @@ class EventNewsModsController < ApplicationController puts e.to_s event_time = "" end + members = MemberProfile.find(event_news.other_member_profiles) + profiles = [] + members.each do |member| + profiles << { + "picture" => member.get_avatar, + "name" => member.name, + "autobiography" => member.autobiography + } + end { "tags" => tags, "event_news_files" => files, + "profiles" => profiles, "event_news_links" => links, "event_carousel_images" => event_carousel_images, "data" => { diff --git a/app/models/event_news.rb b/app/models/event_news.rb index 8694bf7..9ec740d 100644 --- a/app/models/event_news.rb +++ b/app/models/event_news.rb @@ -95,6 +95,7 @@ class EventNews field :other_mailaddress field :image_description, localize: true field :top_end_date, :type => DateTime + field :other_member_profiles, :type => Array, :default => [] mount_uploader :image, ImageUploader @@ -111,7 +112,7 @@ class EventNews is_approved_and_show .valid_time_range .order( - EventNewsHelper.is_postdate_sort_first ? + EventNewsHelper.is_postdate_sort_first ? {postdate: :desc, event_date: :desc, id: :desc} : {event_date: :desc, postdate: :desc, id: :desc} ) @@ -126,7 +127,7 @@ class EventNews {"postdate"=>{"$lte"=> Time.now}, "deadline"=>nil} ]) .order( - EventNewsHelper.enable_manually_sort ? + EventNewsHelper.enable_manually_sort ? {is_top: :desc, sort_number: :asc} : {is_top: :desc} ) @@ -575,7 +576,7 @@ class EventNews feed_cache = EventNewsFeedCache.where(uid: uid, start: startdt, end: enddt, date: dt) if force_update feed_cache = nil - else + else feed_cache_old = feed_cache.all_of([{:invalid_date.ne=>nil},{:invalid_date.lte => Time.now}]).last feed_cache.all_of([{:invalid_date.ne=>nil},{:invalid_date.lte => Time.now}]).destroy count = feed_cache.count diff --git a/app/views/admin/event_news/_form.html.erb b/app/views/admin/event_news/_form.html.erb index 03beae9..9dc869f 100644 --- a/app/views/admin/event_news/_form.html.erb +++ b/app/views/admin/event_news/_form.html.erb @@ -169,6 +169,13 @@ <% end %> + +
+ +
+ <%= render partial: 'admin/member_selects/email_selection_box', locals: {field: 'event_news[other_member_profiles][]', email_members: MemberProfile.find(@event_news.other_member_profiles), select_name: "author_members", index: 'author_members', extra_class: 'custom-class'} %> +
+
@@ -352,7 +359,7 @@
- <%= render partial: 'admin/member_selects/email_selection_box', locals: {field: 'event_news[email_member_ids][]', email_members: @event_news.email_members} %> + <%= render partial: 'admin/member_selects/email_selection_box', locals: {field: 'event_news[email_member_ids][]', email_members: @event_news.email_members, select_name: "mail_members", index: 'mail_members', extra_class: 'custom-class'} %>