saurabh
/
announcement-test
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added hashtags

This commit is contained in:
rulingcom 2025-11-10 19:33:49 +08:00
parent 4ed76d7b82
commit d85140127c
5 changed files with 52 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/announcements_controller.rb
View File

@ -132,7 +132,8 @@ class AnnouncementsController < ApplicationController
"img_src" => image_url || DefaultImgSrc, "img_src" => image_url || DefaultImgSrc,
"img_description" => desc, "img_description" => desc,
"more" => t("announcement.more"), "more" => t("announcement.more"),
"view_count" => a.view_count "view_count" => a.view_count,
"orbithashtags" => a.hashtags_for_frontend
} }
else else
a a
@ -832,7 +833,8 @@ class AnnouncementsController < ApplicationController
"hide_class" => announcement.display_img? ? announcement.image_display_class : ' hide', "hide_class" => announcement.display_img? ? announcement.image_display_class : ' hide',
"alt_title" => desc, "alt_title" => desc,
"carousel_html" => carousel_html, "carousel_html" => carousel_html,
"sub_anncs_text" => sub_anncs_text "sub_anncs_text" => sub_anncs_text,
"orbithashtags" => announcement.hashtags_for_frontend
}, },
"comments" => announcement.comments, "comments" => announcement.comments,
"show_comment_flag" => show_comment_flag, "show_comment_flag" => show_comment_flag,

6
app/helpers/announcements_helper.rb
View File

@ -140,9 +140,15 @@ module AnnouncementsHelper
} }
end end
if !params["source"].present? if !params["source"].present?
if params["orbithashtag"].present?
announcements = Bulletin.can_display_and_sorted
.filter_by_categories(categories, false).filter_by_hashtag(OrbitHelper.page_hashtag_id).filter_by_tags(tags)
.where(:title.nin => ["",nil])
else
announcements = Bulletin.can_display_and_sorted announcements = Bulletin.can_display_and_sorted
.filter_by_categories(categories, false).filter_by_tags(tags) .filter_by_categories(categories, false).filter_by_tags(tags)
.where(:title.nin => ["",nil]) .where(:title.nin => ["",nil])
end
if !extra_match_cond.empty? if !extra_match_cond.empty?
announcements = announcements.and(extra_match_cond) announcements = announcements.and(extra_match_cond)
end end

1
app/models/bulletin.rb
View File

@ -6,6 +6,7 @@ class Bulletin
include OrbitModel::Impression include OrbitModel::Impression
# encoding: utf-8 # encoding: utf-8
include OrbitTag::Taggable include OrbitTag::Taggable
include OrbitHashtag::Hashtaggable
include OrbitCategory::Categorizable include OrbitCategory::Categorizable
include Slug include Slug
require 'announcement/cache' require 'announcement/cache'

9
app/views/admin/announcements/_form.html.erb
View File

@ -80,6 +80,7 @@
<li><a href="#status" data-toggle="tab"><%= t(:status) %></a></li> <li><a href="#status" data-toggle="tab"><%= t(:status) %></a></li>
<% end %> <% end %>
<li><a href="#tag" data-toggle="tab"><%= t(:tags) %></a></li> <li><a href="#tag" data-toggle="tab"><%= t(:tags) %></a></li>
<li><a href="#hashtag" data-toggle="tab"><%= t(:hashtags) %></a></li>
<li><a href="#imageupload" data-toggle="tab"><%= t('announcement.image') %></a></li> <li><a href="#imageupload" data-toggle="tab"><%= t('announcement.image') %></a></li>
<li><a href="#carousel_image_upload" data-toggle="tab" title="<%= t('announcement.carousel_image_title') %>"><%= t('announcement.carousel_image') %></a></li> <li><a href="#carousel_image_upload" data-toggle="tab" title="<%= t('announcement.carousel_image_title') %>"><%= t('announcement.carousel_image') %></a></li>
<li><a href="#relation_announcements_list" data-toggle="tab" title="<%= t('announcement.relation_announcements_list') %>"><%= t('announcement.relation_announcements_list') %></a></li> <li><a href="#relation_announcements_list" data-toggle="tab" title="<%= t('announcement.relation_announcements_list') %>"><%= t('announcement.relation_announcements_list') %></a></li>
@ -297,6 +298,14 @@
</div> </div>
</div> </div>
<!-- Hashtag Module -->
<div class="tab-pane fade" id="hashtag">
<div class="control-group">
<label class="control-label muted"><%= t(:hashtags) %></label>
<%= select_hashtags(f, @module_app) %>
</div>
</div>
<!-- Images Module --> <!-- Images Module -->
<div class="tab-pane fade" id="imageupload"> <div class="tab-pane fade" id="imageupload">

1
lib/announcement/engine.rb
View File

@ -93,6 +93,7 @@ module Announcement
widget_methods ["widget","random_announcement_widget", "tag_cloud"] widget_methods ["widget","random_announcement_widget", "tag_cloud"]
widget_settings [{"data_count"=>30}] widget_settings [{"data_count"=>30}]
taggable "Bulletin" taggable "Bulletin"
hashtaggable "Bulletin"
categorizable categorizable
authorizable authorizable
frontend_enabled frontend_enabled