Skip to content

Commit

Permalink
Replace current meetings hook with highlighted elements hook (#5897)
Browse files Browse the repository at this point in the history
* feat: replace current meetings hook with highlighted elements hook

This will include proposals, accountability and more elements apart from meetings

* doc: add changelog entry

* fix: missing translation added

Co-authored-by: Oliver Valls <oliver.vh@coditramuntana.com>
  • Loading branch information
leio10 and tramuntanal committed Apr 1, 2020
1 parent e4df011 commit cc2f283
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 6 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ Due to [\#5553](https://github.com/decidim/decidim/pull/5553), SSL is turned on
- **decidim-comments**: Update rspec comment_activity_cell_spec to check existence of card__content css class instead of car-data css class[#5779](https://github.com/decidim/decidim/issues/5779)
### Changed

- **decidim-assemblies**: Replace current meetings hook with highlighted elements hook [\#5897](https://github.com/decidim/decidim/pull/5897)
- **decidim-core**: Change the map marker color to the Decidim primary color [\#5870](https://github.com/decidim/decidim/pull/5870)
- **decidim-core**: Add whitespace: nowrap style to compact buttons. [\#5891](https://github.com/decidim/decidim/pull/5891)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,10 @@ edit_link(
</div>
<% end %>
<%= render_hook(:current_participatory_space_meetings) %>
<%= attachments_for current_participatory_space %>
<%= render_hook(:participatory_space_highlighted_elements) %>
<% if current_participatory_space.children.visible_for(current_user).count.positive? %>
<section id="assemblies-grid" class="section row collapse">
<h4 class="section-heading"><%= t("children", scope: "decidim.assemblies.show") %></h4>
Expand Down
1 change: 1 addition & 0 deletions decidim-assemblies/config/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,7 @@ en:
meetings_count: Meetings
orders_count: Supports
pages_count: Pages
posts_count: Posts
projects_count: Projects
proposals_count: Proposals
results_count: Results
Expand Down
4 changes: 0 additions & 4 deletions decidim-meetings/lib/decidim/meetings/engine.rb
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,6 @@ class Engine < ::Rails::Engine
end
end

Decidim.view_hooks.register(:current_participatory_space_meetings, priority: Decidim::ViewHooks::HIGH_PRIORITY) do |view_context|
view_context.cell("decidim/meetings/highlighted_meetings", view_context.current_participatory_space)
end

# This view hook is used in card cells. It renders the next upcoming
# meeting for the given participatory space.
Decidim.view_hooks.register(:upcoming_meeting_for_card, priority: Decidim::ViewHooks::LOW_PRIORITY) do |view_context|
Expand Down

0 comments on commit cc2f283

Please sign in to comment.