decidim-assemblies 0.13.1 → 0.14.1

data/lib/decidim/assemblies/admin_engine.rb

@@ -12,6 +12,7 @@ module Decidim
       isolate_namespace Decidim::Assemblies::Admin
 
       paths["db/migrate"] = nil
+      paths["lib/tasks"] = nil
 
       routes do
         resources :assemblies, param: :slug, except: :show do

data/lib/decidim/assemblies/engine.rb

@@ -64,19 +64,6 @@ module Decidim
       end
 
       initializer "decidim_assemblies.view_hooks" do
-        Decidim.view_hooks.register(:highlighted_elements, priority: Decidim::ViewHooks::MEDIUM_PRIORITY) do |view_context|
-          highlighted_assemblies = OrganizationPrioritizedAssemblies.new(view_context.current_organization, view_context.current_user)
-
-          next unless highlighted_assemblies.any?
-
-          view_context.render(
-            partial: "decidim/assemblies/pages/home/highlighted_assemblies",
-            locals: {
-              highlighted_assemblies: highlighted_assemblies
-            }
-          )
-        end
-
         Decidim.view_hooks.register(:user_profile_bottom, priority: Decidim::ViewHooks::MEDIUM_PRIORITY) do |view_context|
           assemblies = OrganizationPublishedAssemblies.new(view_context.current_organization, view_context.current_user)
                                                       .query.distinct
@@ -86,6 +73,9 @@ module Decidim
 
           next unless assemblies.any?
 
+          # Since this is rendered inside a cell we need to access the parent context in order to render it.
+          view_context = view_context.controller.view_context
+
           view_context.render(
             partial: "decidim/assemblies/pages/user_profile/member_of",
             locals: {
@@ -94,6 +84,13 @@ module Decidim
           )
         end
       end
+
+      initializer "decidim_assemblies.content_blocks" do
+        Decidim.content_blocks.register(:homepage, :highlighted_assemblies) do |content_block|
+          content_block.cell = "decidim/assemblies/content_blocks/highlighted_assemblies"
+          content_block.public_name_key = "decidim.assemblies.content_blocks.highlighted_assemblies.name"
+        end
+      end
     end
   end
 end

data/lib/decidim/assemblies/participatory_space.rb

@@ -29,6 +29,14 @@ Decidim.register_participatory_space(:assemblies) do |participatory_space|
     organization = Decidim::Organization.first
     seeds_root = File.join(__dir__, "..", "..", "..", "db", "seeds")
 
+    Decidim::ContentBlock.create(
+      organization: organization,
+      weight: 32,
+      scope: :homepage,
+      manifest_name: :highlighted_assemblies,
+      published_at: Time.current
+    )
+
     2.times do |n|
       assembly = Decidim::Assembly.create!(
         title: Decidim::Faker::Localized.sentence(5),

data/lib/decidim/assemblies/test/factories.rb

@@ -24,8 +24,8 @@ FactoryBot.define do
     target { Decidim::Faker::Localized.sentence(3) }
     participatory_scope { Decidim::Faker::Localized.sentence(1) }
     participatory_structure { Decidim::Faker::Localized.sentence(2) }
-    show_statistics true
-    private_space false
+    show_statistics { true }
+    private_space { false }
     purpose_of_action { Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(2) } }
     composition { Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(2) } }
     assembly_type { "others" }
@@ -38,7 +38,7 @@ FactoryBot.define do
     closing_date { 2.months.from_now.at_midnight }
     closing_date_reason { Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(2) } }
     internal_organisation { Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(2) } }
-    is_transparent true
+    is_transparent { true }
     special_features { Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(2) } }
     twitter_handler { "others" }
     facebook_handler { "others" }
@@ -47,11 +47,11 @@ FactoryBot.define do
     github_handler { "others" }
 
     trait :promoted do
-      promoted true
+      promoted { true }
     end
 
     trait :unpublished do
-      published_at nil
+      published_at { nil }
     end
 
     trait :published do
@@ -66,7 +66,7 @@ FactoryBot.define do
   factory :assembly_user_role, class: "Decidim::AssemblyUserRole" do
     user
     assembly { create :assembly, organization: user.organization }
-    role "admin"
+    role { "admin" }
   end
 
   factory :assembly_admin, parent: :user, class: "Decidim::User" do

data/lib/decidim/assemblies/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-assemblies version.
   module Assemblies
     def self.version
-      "0.13.1"
+      "0.14.1"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-assemblies
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.14.1
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-24 00:00:00.000000000 Z
+date: 2018-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,42 +18,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: 0.14.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: 0.14.1
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: 0.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: 0.14.1
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: 0.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: 0.14.1
 description: Assemblies component for decidim.
 email:
 - josepjaume@gmail.com
@@ -77,6 +77,8 @@ files:
 - app/cells/decidim/assemblies/assembly_m_cell.rb
 - app/cells/decidim/assemblies/assembly_member/show.erb
 - app/cells/decidim/assemblies/assembly_member_cell.rb
+- app/cells/decidim/assemblies/content_blocks/highlighted_assemblies/show.erb
+- app/cells/decidim/assemblies/content_blocks/highlighted_assemblies_cell.rb
 - app/commands/decidim/assemblies/admin/copy_assembly.rb
 - app/commands/decidim/assemblies/admin/create_assembly.rb
 - app/commands/decidim/assemblies/admin/create_assembly_admin.rb
@@ -128,6 +130,7 @@ files:
 - app/presenters/decidim/assemblies/admin_log/value_types/role_presenter.rb
 - app/presenters/decidim/assemblies/assembly_stats_presenter.rb
 - app/presenters/decidim/assembly_member_presenter.rb
+- app/presenters/decidim/assembly_presenter.rb
 - app/presenters/decidim/log/value_types/assembly_presenter.rb
 - app/queries/decidim/assemblies/admin/admin_users.rb
 - app/queries/decidim/assemblies/admin/assembly_members.rb
@@ -162,7 +165,6 @@ files:
 - app/views/decidim/assemblies/assemblies/show.html.erb
 - app/views/decidim/assemblies/assembly_members/index.html.erb
 - app/views/decidim/assemblies/assembly_widgets/show.html.erb
-- app/views/decidim/assemblies/pages/home/_highlighted_assemblies.html.erb
 - app/views/decidim/assemblies/pages/user_profile/_member_of.html.erb
 - app/views/decidim/assembly_members/_assembly_member.html.erb
 - app/views/layouts/decidim/_assembly_header.html.erb
@@ -177,6 +179,7 @@ files:
 - config/locales/fi.yml
 - config/locales/fr.yml
 - config/locales/gl.yml
+- config/locales/hu.yml
 - config/locales/it.yml
 - config/locales/nl.yml
 - config/locales/pl.yml
@@ -227,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Decidim assemblies module

data/app/views/decidim/assemblies/pages/home/_highlighted_assemblies.html.erb

@@ -1,29 +0,0 @@
-<div class="row" id="highlighted-assemblies">
-  <h3 class="section-heading"><%= t(".active_assemblies") %></h3>
-  <div class="row collapse">
-    <div class="row small-up-1 smallmedium-up-2 mediumlarge-up-3
-      large-up-4 card-grid">
-      <% highlighted_assemblies.each do |assembly| %>
-        <div class="column">
-          <article class="card card--assembly card--mini">
-            <%= link_to decidim_assemblies.assembly_path(assembly), class: "card__link" do %>
-              <div class="card__image-top"
-                style="background-image:url(<%= assembly.hero_image.url %>)"></div>
-            <% end %>
-            <div class="card__content">
-              <%= link_to decidim_assemblies.assembly_path(assembly), class: "card__link" do %>
-                <h4 class="card__title"><%= translated_attribute assembly.title %></h4>
-              <% end %>
-            </div>
-          </article>
-        </div>
-      <% end %>
-    </div>
-  </div>
-</div>
-<div class="row" id="see-all-assemblies">
-  <div class="columns small-centered small-12
-    smallmedium-8 medium-6 large-4">
-    <%= link_to t(".see_all_assemblies"), decidim_assemblies.assemblies_path, class: "button expanded hollow button--sc home-section__cta" %>
-  </div>
-</div>