decidim-plans 0.16.9 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9423a9478cec855e35949926ffde99ae160f77e17fc4dd4fc9bc17e01b7c76e
-  data.tar.gz: a507c3b1690c189104bbc737ce9c046a8b2f9386e4198f8c84179f8618aa5ec8
+  metadata.gz: 8b2569afb59eca810021b9ec0d459657801ad410b7708d646fc183b46504912d
+  data.tar.gz: fb3873511cb120e71dad365a44de68dec24f08316fa3108c9ca98f6e49200bd0
 SHA512:
-  metadata.gz: d5beb24f4e9269901be60f1581cf0e6035bf80f6e304311ed5fee8469447eff9beea6e3401f210f76870a9db8aed0f91f4312d9996342574c28c7e3d76931b99
-  data.tar.gz: 5cc5bdf7932645f7aa6bc1e894995213f49b26a3a5508c1eddd0297ddce92aeb3b1cfe36d83f44c0d0b29290d2dde3dc06162ea9f25cf87f1de48101a3ace48c
+  metadata.gz: '060963502893a71d947c387f730dd8e5d3ce9ac007e55a47d1d64c4597e6dca81cd4ff8625aa5cb10c9c559fc9166fe350cc4aad9adcfa96f88ad17757eda186'
+  data.tar.gz: 911905eed906b4b99b844716389a3a8e8011637d4330181d9d739e759d8dae2f464f2b0d5353203e4ce22cb04926e6eb8526f6ab9727367c6cb2e0498ede3b6e

data/app/commands/decidim/plans/admin/create_plan.rb

@@ -34,6 +34,7 @@ module Decidim
             transaction do
               create_plan
               create_plan_contents
+              link_proposals
               update_attachments if process_attachments?
               send_notification
             end
@@ -57,7 +58,6 @@ module Decidim
             )
             plan.coauthorships.build(author: form.author)
             plan.save!
-            plan.proposals << form.proposals
             plan
           end
 
@@ -74,6 +74,10 @@ module Decidim
           end
         end
 
+        def link_proposals
+          plan.link_resources(proposals, "included_proposals")
+        end
+
         def attributes
           {
             title: form.title,
@@ -85,6 +89,12 @@ module Decidim
           }
         end
 
+        def proposals
+          @proposals ||= plan.sibling_scope(:proposals).where(
+            id: @form.proposal_ids
+          )
+        end
+
         def send_notification
           Decidim::EventsManager.publish(
             event: "decidim.events.plans.plan_published",

data/app/commands/decidim/plans/admin/export_plans_to_budgets.rb

@@ -51,7 +51,8 @@ module Decidim
               project.save!
 
               # Link included proposals to the project
-              project.link_resources(original_plan.proposals, "included_proposals")
+              proposals = original_plan.linked_resources(:proposals, "included_proposals")
+              project.link_resources(proposals, "included_proposals")
 
               # Link the plan to the project
               project.link_resources([original_plan], "included_plans")

data/app/commands/decidim/plans/admin/update_plan.rb

@@ -41,6 +41,7 @@ module Decidim
             transaction do
               update_plan
               update_plan_contents
+              link_proposals
               update_attachments if process_attachments?
             end
           end
@@ -72,18 +73,27 @@ module Decidim
           end
         end
 
+        def link_proposals
+          plan.link_resources(proposals, "included_proposals")
+        end
+
         def attributes
           {
             title: form.title,
             category: form.category,
             scope: form.scope,
-            proposals: form.proposals,
             # The update token ensures a new version is always created even if
             # the other attributes have not changed. This is needed to force a
             # new version to show the changes to associated models.
             update_token: Time.now.to_f
           }
         end
+
+        def proposals
+          @proposals ||= plan.sibling_scope(:proposals).where(
+            id: form.proposal_ids
+          )
+        end
       end
     end
   end

data/app/commands/decidim/plans/create_plan.rb

@@ -35,6 +35,7 @@ module Decidim
           transaction do
             create_plan
             create_plan_contents
+            link_proposals
             update_attachments if process_attachments?
           end
         end
@@ -61,7 +62,6 @@ module Decidim
           )
           plan.coauthorships.build(author: @current_user, user_group: @form.user_group)
           plan.save!
-          plan.proposals << form.proposals
           plan
         end
 
@@ -78,6 +78,10 @@ module Decidim
         end
       end
 
+      def link_proposals
+        plan.link_resources(proposals, "included_proposals")
+      end
+
       def user_group
         @user_group ||= Decidim::UserGroup.find_by(organization: organization, id: form.user_group_id)
       end
@@ -85,6 +89,12 @@ module Decidim
       def organization
         @organization ||= @current_user.organization
       end
+
+      def proposals
+        @proposals ||= plan.sibling_scope(:proposals).where(
+          id: @form.proposal_ids
+        )
+      end
     end
   end
 end

data/app/commands/decidim/plans/publish_plan.rb

@@ -34,6 +34,8 @@ module Decidim
 
       private
 
+      attr_reader :plan
+
       def publish_plan
         Decidim.traceability.perform_action!(
           "publish",
@@ -85,9 +87,10 @@ module Decidim
       end
 
       def proposal_authors
-        @proposal_authors ||= @plan.proposals.flat_map(
-          &:authors
-        ).select { |a| a.is_a?(Decidim::User) }
+        @proposal_authors ||= begin
+          proposals = plan.linked_resources(:proposals, "included_proposals")
+          proposals.flat_map(&:authors).select { |a| a.is_a?(Decidim::User) }
+        end
       end
     end
   end

data/app/commands/decidim/plans/update_plan.rb

@@ -42,6 +42,7 @@ module Decidim
           transaction do
             update_plan
             update_plan_contents
+            link_proposals
             update_attachments if process_attachments?
           end
         end
@@ -73,18 +74,27 @@ module Decidim
         end
       end
 
+      def link_proposals
+        plan.link_resources(proposals, "included_proposals")
+      end
+
       def attributes
         {
           title: @form.title,
           category: @form.category,
           scope: @form.scope,
-          proposals: @form.proposals,
           # The update token ensures a new version is always created even if
           # the other attributes have not changed. This is needed to force a new
           # version to show the changes to associated models.
           update_token: Time.now.to_f
         }
       end
+
+      def proposals
+        @proposals ||= plan.sibling_scope(:proposals).where(
+          id: @form.proposal_ids
+        )
+      end
     end
   end
 end

data/app/models/decidim/plans/plan.rb

@@ -32,9 +32,6 @@ module Decidim
                class_name: "Decidim::User",
                foreign_key: :decidim_user_id
 
-      has_many :attached_proposals, foreign_key: :decidim_plan_id, dependent: :destroy
-      has_many :proposals, through: :attached_proposals
-
       has_many :contents, foreign_key: :decidim_plan_id, dependent: :destroy
 
       has_many :taggings,

data/app/views/decidim/plans/plans/_attached_proposals.html.erb

@@ -1,8 +1,14 @@
-<% if @plan.proposals.count.nonzero? %>
+<%
+proposals = @plan.linked_resources(:proposals, "included_proposals")
+%>
+
+<% if proposals.count.nonzero? %>
   <div class="attached-proposals">
-    <h4 class="section-heading"><%= t(".attached_proposals") %></h3>
+    <h4 class="section-heading">
+      <%= t("decidim.resource_links.included_proposals.plan_proposal") %>
+    </h4>
     <div class="collapsible-list row small-up-1 medium-up-2 card-grid">
-      <% @plan.proposals.each do |proposal| %>
+      <% proposals.each do |proposal| %>
         <%= card_for proposal, from: proposal %>
       <% end %>
     </div>

data/app/views/decidim/plans/plans/_linked_plans.html.erb

@@ -0,0 +1,32 @@
+<div class="card card--action card--list">
+  <% resources.each do |plan| %>
+    <div class="card--list__item">
+      <div class="card--list__text">
+        <%= link_to resource_locator(plan).path do %>
+          <%= icon "proposals", class: "card--list__icon", remove_icon_class: true %>
+        <% end %>
+        <div>
+          <%= link_to resource_locator(plan).path, class: "card__link" do %>
+            <h5 class="card--list__heading"><%== decidim_html_escape(present(plan).title) %></h5>
+          <% end %>
+          <% present(plan) do |plan| %>
+            <div class="author">
+              <span class="author__avatar">
+                <%= image_tag plan.author.avatar_url %>
+              </span>
+              <span class="author__name">
+                <strong><%= plan.author.name %></strong>
+                <%= plan.author.nickname %>
+              </span>
+            </div>
+          <% end %>
+        </div>
+      </div>
+      <div class="card--list__data">
+        <span class="card--list__data__number">
+          <%= plan.authors.count %>
+        </span> <%= t(".plan_authors", count: plan.authors.count) %>
+      </div>
+    </div>
+  <% end %>
+</div>

data/app/views/decidim/plans/plans/_plan_preview.html.erb

@@ -1 +1,11 @@
-<%= card_for plan, size: :m, full_description: true %>
+<div class="row column view-header">
+  <h2 class="heading2"><%= present(plan).title %></h2>
+  <%= cell("decidim/plans/coauthorships", plan, has_actions: false, size: 3, context: { current_user: current_user }) %>
+</div>
+<div class="row column">
+  <%= render partial: "contents" %>
+  <%= cell "decidim/plans/tags", plan, context: { extra_classes: ["tags--plan"] } %>
+</div>
+<br />
+<%= render partial: "attached_proposals" %>
+<%= attachments_for plan %>

data/app/views/decidim/plans/plans/preview.html.erb

@@ -1,12 +1,15 @@
 <div class="row">
-  <div class="columns large-6 large-push-3">
+  <div class="columns large-8 large-push-2">
     <div class="card">
       <div class="p-l">
         <%= render partial: "plan_preview", locals: { plan: @plan } %>
-        <div class="row column flex-center">
-          <%= link_to t(".modify"), edit_plan_path(@plan) %>
+        <br>
+        <div class="actions">
+          <%= button_to t(".publish"), publish_plan_path(@plan), method: :post, class: "button expanded button--nomargin" %>
 
-          <%= button_to t(".publish"), publish_plan_path(@plan), method: :post, class: "button button--nomargin small" %>
+          <div class="text-center">
+            <%= link_to t(".modify"), edit_plan_path(@plan) %>
+          </div>
         </div>
       </div>
     </div>

data/config/locales/en.yml

@@ -51,6 +51,9 @@ en:
             comments_blocked: Comments blocked
             creation_enabled: Creation enabled
             plan_answering_enabled: Answering enabled
+    filters:
+      linked_classes:
+        plan: Plans
     pages:
       home:
         statistics:
@@ -224,8 +227,6 @@ en:
             name: Name
             taggings_count: Number of uses
       plans:
-        attached_proposals:
-          attached_proposals: Attached proposals
         count:
           plans_count:
             one: "%{count} plan"
@@ -279,6 +280,8 @@ en:
         index:
           new_plan: New plan
           see_all_withdrawn: See all withdrawn
+        linked_plans:
+          plan_authors: Number of authors
         new:
           create: Create
           title: Create plan
@@ -384,6 +387,10 @@ en:
           version_number_out_of_total: "%{current_version} out of %{total_count}"
         version:
           version_index: Version %{index}
+    resource_links:
+      included_proposals:
+        plan_proposal: Related proposals
+        proposal_plan: Related plans
     scopes:
       global: Global
     events:

data/config/locales/fi.yml

@@ -50,6 +50,9 @@ fi:
             comments_blocked: Kommentointi estetty
             creation_enabled: Luonti sallittu
             plan_answering_enabled: Vastaaminen sallittu
+    filters:
+      linked_classes:
+        plan: Suunnitelmat
     pages:
       home:
         statistics:
@@ -219,8 +222,6 @@ fi:
             name: Nimi
             taggings_count: Käyttömäärä
       plans:
-        attached_proposals:
-          attached_proposals: Liitetyt ehdotukset
         count:
           plans_count:
             one: "%{count} suunnitelma"
@@ -272,6 +273,8 @@ fi:
         index:
           new_plan: Uusi suunnitelma
           see_all_withdrawn: Näytä kaikki peruutetut
+        linked_plans:
+          plan_authors: Laatijoiden määrä
         new:
           create: Luo
           title: Luo suunnitelma
@@ -375,6 +378,10 @@ fi:
           version_number_out_of_total: "%{current_version} / %{total_count}"
         version:
           version_index: Versio %{index}
+    resource_links:
+      included_proposals:
+        plan_proposal: Liitetyt ehdotukset
+        proposal_plan: Liitetyt suunnitelmat
     scopes:
       global: Yleinen
     events:

data/config/locales/sv.yml

@@ -50,6 +50,9 @@ sv:
             comments_blocked: Kommentarer blockerade
             creation_enabled: Skapande tillåtet
             plan_answering_enabled: Svar tillåtna
+    filters:
+      linked_classes:
+        plan: Planer
     pages:
       home:
         statistics:
@@ -219,8 +222,6 @@ sv:
             name: Namn
             taggings_count: Antal användningsområden
       plans:
-        attached_proposals:
-          attached_proposals: Bifogade förslag
         count:
           plans_count:
             one: "%{count} plan"
@@ -272,6 +273,8 @@ sv:
         index:
           new_plan: Ny plan
           see_all_withdrawn: Visa alla annullerade
+        linked_plans:
+          plan_authors: Antal författare
         new:
           create: Skapa
           title: Skapa plan
@@ -375,6 +378,10 @@ sv:
           version_number_out_of_total: "%{current_version} / %{total_count}"
         version:
           version_index: Version %{index}
+    resource_links:
+      included_proposals:
+        plan_proposal: Bifogade förslag
+        proposal_plan: Relaterade planer
     scopes:
       global: Allmän
     events:

data/db/migrate/20190603211538_change_plans_related_proposals_to_resource_links.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+class ChangePlansRelatedProposalsToResourceLinks < ActiveRecord::Migration[5.2]
+  def up
+    Decidim::Plans::Plan.all.each do |plan|
+      proposal_ids = ActiveRecord::Base.connection.execute(
+        "SELECT decidim_proposal_id FROM decidim_plans_attached_proposals " \
+        "WHERE decidim_plan_id = #{plan.id}"
+      ).pluck("decidim_proposal_id")
+
+      say("Linking proposals for plan: #{plan.id}")
+
+      next unless proposal_ids.count.positive?
+
+      say("--Proposal IDs: #{proposal_ids.join(",")}")
+
+      plan.link_resources(
+        Decidim::Proposals::Proposal.where(id: proposal_ids),
+        "included_proposals"
+      )
+    end
+
+    # Drop the unnecessary attached proposals table
+    drop_table :decidim_plans_attached_proposals
+  end
+
+  def down
+    # Re-create the attached proposals table
+    create_table :decidim_plans_attached_proposals do |t|
+      t.references :decidim_plan, index: true
+      t.references :decidim_proposal, index: true
+
+      t.timestamps
+    end
+
+    Decidim::Plans::Plan.all.each do |plan|
+      say("Reverting attached proposals for plan: #{plan.id}")
+      plan.linked_resources(:proposals, "included_proposals").each do |proposal|
+        say("--Proposal ID: #{proposal.id}")
+        ActiveRecord::Base.connection.execute(
+          "INSERT INTO decidim_plans_attached_proposals " \
+          "(decidim_plan_id, decidim_proposal_id, created_at, updated_at)" \
+          "VALUES (#{plan.id}, #{proposal.id}, NOW(), NOW())"
+        )
+      end
+    end
+  end
+end

data/lib/decidim/plans/component.rb

@@ -41,6 +41,7 @@ Decidim.register_component(:plans) do |component|
 
   component.register_resource(:plan) do |resource|
     resource.model_class_name = "Decidim::Plans::Plan"
+    resource.template = "decidim/plans/plans/linked_plans"
     resource.card = "decidim/plans/plan"
   end
 
@@ -164,7 +165,16 @@ Decidim.register_component(:plans) do |component|
         plan.add_coauthor(participatory_space.organization)
         plan.save!
 
-        plan.proposals << proposals.slice!(0, 2) if proposals.length > 2
+        unless proposals.empty?
+          linked_proposals = begin
+            if proposals.length > 2
+              proposals.slice!(0, 2)
+            else
+              proposals
+            end
+          end
+          plan.link_resources(linked_proposals, "included_proposals")
+        end
 
         plan
       end

data/lib/decidim/plans/plan_serializer.rb

@@ -17,6 +17,7 @@ module Decidim
       def serialize
         values = {
           id: plan.id,
+          authors: author_details,
           category: {
             id: plan.category.try(:id),
             name: plan.category.try(:name)
@@ -60,16 +61,26 @@ module Decidim
 
       attr_reader :plan
 
+      def author_details
+        plan.authors.map do |author|
+          "#{author.class}/#{author.id}"
+        end
+      end
+
       def component
         plan.component
       end
 
+      def related_proposals
+        plan.linked_resources(:proposals, "included_proposals")
+      end
+
       def related_proposal_ids
-        plan.proposals.map(&:id)
+        related_proposals.map(&:id)
       end
 
       def related_proposal_urls
-        plan.proposals.map do |proposal|
+        related_proposals.map do |proposal|
           Decidim::ResourceLocatorPresenter.new(proposal).url
         end
       end

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

@@ -66,11 +66,6 @@ FactoryBot.define do
     end
   end
 
-  factory :attached_proposal, class: "Decidim::Plans::AttachedProposal" do
-    plan
-    proposal
-  end
-
   factory :plan, class: "Decidim::Plans::Plan" do
     transient do
       users { nil }
@@ -94,7 +89,7 @@ FactoryBot.define do
 
         proposal_component = create(:proposal_component, participatory_space: plan.component.participatory_space)
         proposals = evaluator.plan_proposals || [create(:proposal, component: proposal_component)]
-        plan.attached_proposals = proposals.map { |p| create(:attached_proposal, plan: plan, proposal: p) }
+        plan.link_resources(proposals, "included_proposals")
       end
       plan.update!(tags: evaluator.tags) if evaluator.tags && evaluator.tags.count.positive?
     end

data/lib/decidim/plans/version.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   module Plans
-    VERSION = "0.16.9"
-    DECIDIM_VERSION = "~> 0.16.0"
+    VERSION = "0.17.0"
+    DECIDIM_VERSION = "~> 0.17.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-plans
 version: !ruby/object:Gem::Version
-  version: 0.16.9
+  version: 0.17.0
 platform: ruby
 authors:
 - Antti Hukkanen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-28 00:00:00.000000000 Z
+date: 2019-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -16,98 +16,98 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.17.0
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.17.0
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.17.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.17.0
 - !ruby/object:Gem::Dependency
   name: decidim-assemblies
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.17.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.17.0
 - !ruby/object:Gem::Dependency
   name: decidim-budgets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.17.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.17.0
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.17.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.17.0
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.17.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.17.0
 description: Plans component allows people to author plans based on the proposals
   that can be converted into budgeting projects.
 email:
@@ -220,7 +220,6 @@ files:
 - app/helpers/decidim/plans/user_group_helper.rb
 - app/models/concerns/decidim/plans/traceable.rb
 - app/models/decidim/plans/application_record.rb
-- app/models/decidim/plans/attached_proposal.rb
 - app/models/decidim/plans/content.rb
 - app/models/decidim/plans/paper_trail/version.rb
 - app/models/decidim/plans/paper_trail/version_association.rb
@@ -281,6 +280,7 @@ files:
 - app/views/decidim/plans/plans/_filters.html.erb
 - app/views/decidim/plans/plans/_filters_small_view.html.erb
 - app/views/decidim/plans/plans/_form.html.erb
+- app/views/decidim/plans/plans/_linked_plans.html.erb
 - app/views/decidim/plans/plans/_new_plan_button.html.erb
 - app/views/decidim/plans/plans/_plan.html.erb
 - app/views/decidim/plans/plans/_plan_preview.html.erb
@@ -320,6 +320,7 @@ files:
 - db/migrate/20190214124014_add_closed_at_to_decidim_plans.rb
 - db/migrate/20190329161710_fix_plan_closing_workflow_states.rb
 - db/migrate/20190331141058_create_decidim_plans_tags_and_plan_taggings.rb
+- db/migrate/20190603211538_change_plans_related_proposals_to_resource_links.rb
 - lib/decidim/content_parsers/plan_parser.rb
 - lib/decidim/content_renderers/plan_renderer.rb
 - lib/decidim/plans.rb

data/app/models/decidim/plans/attached_proposal.rb

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Plans
-    # This class holds the association between a Plan and a
-    # Decidim::Proposals::Proposal.
-    class AttachedProposal < ApplicationRecord
-      belongs_to :plan, class_name: "Decidim::Plans::Plan", foreign_key: "decidim_plan_id"
-      belongs_to :proposal, class_name: "Decidim::Proposals::Proposal", foreign_key: "decidim_proposal_id"
-    end
-  end
-end