diff --git a/Gemfile.lock b/Gemfile.lock index 720532eac..9ed7c3267 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -296,7 +296,7 @@ GEM mini_magick (4.11.0) mini_mime (1.1.5) mini_portile2 (2.8.6) - minitest (5.22.3) + minitest (5.23.1) msgpack (1.5.3) multi_json (1.15.0) net-imap (0.4.9.1) @@ -312,7 +312,7 @@ GEM net-protocol net-ssh (7.0.1) nio4r (2.7.0) - nokogiri (1.16.4) + nokogiri (1.16.5) mini_portile2 (~> 2.8.2) racc (~> 1.4) optimist (3.0.1) @@ -338,7 +338,7 @@ GEM public_suffix (4.0.7) puma (5.6.8) nio4r (~> 2.0) - racc (1.7.3) + racc (1.8.0) rack (2.2.9) rack-cors (1.1.1) rack (>= 2.0.0) @@ -405,7 +405,8 @@ GEM actionpack (>= 5.2) railties (>= 5.2) retriable (3.1.2) - rexml (3.2.6) + rexml (3.2.8) + strscan (>= 3.0.9) roo (2.10.0) nokogiri (~> 1) rubyzip (>= 1.3.0, < 3.0.0) @@ -497,6 +498,7 @@ GEM sshkit (1.21.2) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) + strscan (3.1.0) super_diff (0.9.0) attr_extras (>= 6.2.4) diff-lcs @@ -543,7 +545,7 @@ GEM rails (>= 3.2.16) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.6.13) + zeitwerk (2.6.15) PLATFORMS ruby diff --git a/app/admin/news_article.rb b/app/admin/news_article.rb index f12cc1e6f..0e259c87d 100644 --- a/app/admin/news_article.rb +++ b/app/admin/news_article.rb @@ -6,7 +6,7 @@ decorate_with NewsArticleDecorator - permit_params :title, :content, :publication_date, :is_insight, + permit_params :title, :content, :publication_date, :is_insight, :is_event, :created_by_id, :updated_by_id, :short_description, :image, :keywords_string, tpi_sector_ids: [] @@ -33,6 +33,7 @@ image_tag(url_for(t.image)) if t.image.present? end row :is_insight + row :is_event row :updated_at row :updated_by row :created_at @@ -48,6 +49,7 @@ column :short_description column :publication_date column :is_insight + column :is_event actions end @@ -61,6 +63,7 @@ column :keywords, &:keywords_csv column :publication_date column :is_insight + column :is_event end form html: {'data-controller' => 'check-modified'} do |f| @@ -76,6 +79,7 @@ f.input :keywords_string, label: 'Keywords', hint: t('hint.tag'), as: :tags, collection: Keyword.pluck(:name) f.input :image, as: :file, input_html: {accept: 'image/*'} f.input :is_insight + f.input :is_event end f.actions diff --git a/app/javascript/components/tpi/Filters.js b/app/javascript/components/tpi/Filters.js index a8922c03e..8d5d758cd 100644 --- a/app/javascript/components/tpi/Filters.js +++ b/app/javascript/components/tpi/Filters.js @@ -184,7 +184,7 @@ const Filters = ({ types, tags, sectors, resultsSize }) => {
Showing {resultsCount} items in All Publications and news
+Showing {resultsCount} items in All Publications, news and events